Updates to caching