diff --git a/notifications/inc/class.notifications_ajax.inc.php b/notifications/inc/class.notifications_ajax.inc.php
index 60ec50e3e6..2d826fd499 100644
--- a/notifications/inc/class.notifications_ajax.inc.php
+++ b/notifications/inc/class.notifications_ajax.inc.php
@@ -202,7 +202,7 @@ class notifications_ajax {
 	 * @return boolean true
 	 */
 	private function restore_session_data() {
-		$session_data = $GLOBALS['egw']->session->appsession('session_data',self::_appname);
+		$session_data = Api\Cache::getSession(self::_appname, 'session_data');
 		if(is_array($session_data)) {
 			$this->session_data = $session_data;
 		} else {
@@ -218,7 +218,7 @@ class notifications_ajax {
 	 * @return boolean true
 	 */
 	private function save_session_data() {
-		$GLOBALS['egw']->session->appsession('session_data',self::_appname,$this->session_data);
+		Api\Cache::setSession(self::_appname, 'session_data', $this->session_data);
 		return true;
 	}
 }
diff --git a/resources/inc/class.resources_ui.inc.php b/resources/inc/class.resources_ui.inc.php
index 5e0716be7f..a209ce0213 100755
--- a/resources/inc/class.resources_ui.inc.php
+++ b/resources/inc/class.resources_ui.inc.php
@@ -284,7 +284,7 @@ class resources_ui
 		if ($use_all)
 		{
 			// get the whole selection
-			$query = is_array($session_name) ? $session_name : $GLOBALS['egw']->session->appsession('session_data', $session_name);
+			$query = is_array($session_name) ? $session_name : Api\Cache::getSession($session_name, 'session_data');
 
 			@set_time_limit(0);                     // switch off the execution time limit, as it's for big selections to small
 			$query['num_rows'] = -1;        // all