Remove CacheUtil and CacheTestUtil