diff --git a/phpgwapi/inc/class.sessions.inc.php b/phpgwapi/inc/class.sessions.inc.php
index 3e0ac9e7aa..3b6ca4dbb1 100644
--- a/phpgwapi/inc/class.sessions.inc.php
+++ b/phpgwapi/inc/class.sessions.inc.php
@@ -117,7 +117,7 @@
        $this->update_dla();
        $this->account_id = $phpgw->accounts->name2id($this->account_lid);
 
-       if ($this->use_cache) {
+       if ($phpgw_info["server"]["cache_phpgw_info"]) {
       		$t = $this->appsession('phpgw_info_cache','phpgwapi');
 					$phpgw_info["server"]	= $t["server"];
 					$phpgw_info["user"]		= $t["user"];
@@ -219,7 +219,7 @@
       $this->read_repositories();
       $phpgw_info["user"]  = $this->user;
       $phpgw_info["hooks"] = $this->hooks;
-			if ($this->use_cache) {
+			if ($phpgw_info["server"]["cache_phpgw_info"]) {
 					$this->appsession('phpgw_info_cache','phpgwapi',$phpgw_info);
 			}
 
@@ -307,7 +307,7 @@
        $phpgw_info_temp["user"]["kp3"] = "";
        $phpgw_info_temp["flags"] = array();
 
-			if ($this->use_cache) {
+			if ($phpgw_info["server"]["cache_phpgw_info"]) {
 					$this->appsessions("phpgw_info_cache","phpgwapi",$phpgw_info_temp);
 			}
     }
diff --git a/preferences/setup/config.inc.php b/preferences/setup/config.inc.php
index 3cb5101b37..2545e74c81 100644
--- a/preferences/setup/config.inc.php
+++ b/preferences/setup/config.inc.php
@@ -73,3 +73,8 @@
     <td>Would like like phpGroupWare to check for new version<br>when admins login ?:</td>
     <td><input type="checkbox" name="newsettings[checkfornewversion]" value="True"<?php echo ($current_config["checkfornewversion"]?" checked":""); ?>></td>
    </tr>
+
+   <tr bgcolor="e6e6e6">
+    <td>Would like like phpGroupWare to cache the phpgw_info array ?:</td>
+    <td><input type="checkbox" name="newsettings[cache_phpgw_info]" value="True"<?php echo ($current_config["cache_phpgw_info"]?" checked":""); ?>></td>
+   </tr>