Update to new caching infrastructure.