Merge pull request #4027 from arnova/file_cache_not_for_all_fix