Adding support for cleaning cache