More updates to new caches API