Added file caching option