Merge "Remove from preloads/file_cache when clearing the cache"