Cautiously reinstate caching for entities and perms