Major Caching Upgrades