Further revisions to caching