LPS-40631 Avoid PortalCache wrappers wrap up more than once.

cc @ehan