One more caching fix. Reverts 350dd70