Minor changes to the cache clear