CLC-3811 Revert previous PR & temporarily restore pseudo-user caching

I'll patch the bug I missed next week. In the meantime, this will let other changes deploy to the servers.