Merge changes from topic "revert-283559-currentuser-remove-cache-key-ZXSAZPLOCM"

* changes:
  Revert "Remove PerThreadCache"
  Revert "Remove unused CurrentUser#cacheKey method"