Start cleanup of cache interface

Signed-off-by: Luis Pabón <lpabon@redhat.com>