Fix for file caching