Changes to use the native Cache API.