Added file caching