Revert cache clear: not the right fix