More caching updates