Improved naming scheme for the cached files.