Merge "Improve cleanup of file caches."