Merge "Unbreak file caching"