Updated CacheTest