Improved and simplified File cache implementation