Cleanup CacheBuilder class