Cleaning up the cache item file API slightly.