GTNPORTAL-2072 fix more UI cache cases