More updates to caching