Update changelog
Use CacheKeyBuilder to build keys