CacheBuilder is updated to remove warnings.