Working on new version of the cache.