LPS-43357 Refactor PortalCache API
LPS-43357 Fix unit tests