Further work on CubeCache.