Updates to caching system