Revert bad caching change.