LPS-43901 Improve EhcachePortalCacheManager cache management