Improved cache file structure.