Further work in migrating towards using ISCacheItem to refer to cache entries across the whole API.