Finished changes for deleting cache