Change caching to better support max age based invalidation