Searching files from deletes_caches more aggressively
Merge branch 'deleted_file_cache' into develop