LPS-43357 Refactor PortalCache API