Index: panels/panels_mini/panels_mini.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/panels/panels_mini/Attic/panels_mini.module,v
retrieving revision 1.1.2.26
diff -u -r1.1.2.26 panels_mini.module
--- panels/panels_mini/panels_mini.module	27 May 2008 20:21:14 -0000	1.1.2.26
+++ panels/panels_mini/panels_mini.module	29 May 2008 18:28:17 -0000
@@ -597,10 +597,10 @@
  */
 function panels_mini_edit_context($panel_mini, $next = NULL) {
   if (!empty($_POST)) {
-    $panel_mini = panels_common_cache_get('panel_object:panel_mini', $panel_mini->name);
+    $panel_mini = panels_common_cache_get('panel_object:panel_mini');
   }
   else {
-    panels_common_cache_set('panel_object:panel_mini', $panel_mini->name, $panel_mini);
+    panels_common_cache_set('panel_object:panel_mini', NULL, $panel_mini);
   }
 
   drupal_set_title(check_plain($panel_mini->title));
Index: panels/panels_page/panels_page.admin.inc
===================================================================
RCS file: /cvs/drupal/contributions/modules/panels/panels_page/Attic/panels_page.admin.inc,v
retrieving revision 1.1.2.46
diff -u -r1.1.2.46 panels_page.admin.inc
--- panels/panels_page/panels_page.admin.inc	27 May 2008 20:21:13 -0000	1.1.2.46
+++ panels/panels_page/panels_page.admin.inc	29 May 2008 18:28:17 -0000
@@ -571,11 +571,11 @@
  */
 function panels_page_edit_context($name, $next = NULL) {
   if (!empty($_POST)) {
-    $panel_page = panels_common_cache_get('panel_object:panel_page', $name);
+    $panel_page = panels_common_cache_get('panel_object:panel_page');
   }
   else {
     $panel_page = panels_page_load($name);
-    panels_common_cache_set('panel_object:panel_page', $name, $panel_page);
+    panels_common_cache_set('panel_object:panel_page', NULL, $panel_page);
   }
 
   drupal_set_title(check_plain(panels_page_get_title($panel_page)));
Index: panels/panels.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/panels/panels.module,v
retrieving revision 1.10.4.105
diff -u -r1.10.4.105 panels.module
--- panels/panels.module	27 May 2008 20:21:15 -0000	1.10.4.105
+++ panels/panels.module	29 May 2008 18:28:16 -0000
@@ -298,8 +298,8 @@
 /**
  * Save the edited display into the cache.
  */
-function panels_cache_set($did, $cache) {
-  return panels_common_cache_set('panels', $did, $cache);
+function panels_cache_set($did, $data) {
+  panels_common_cache_set('panels', $did, $data);
 }
 
 /**
@@ -314,8 +314,18 @@
 
 /**
  * Get an object from cache.
+ * 
+ * @param string $obj
+ *  Type of object to be retrieved.  
+ * @param integer $did
+ *  (optional) Display ID, if the object to be retrieved is a display.
+ *  Defaults to NULL.
+ * @param boolean $skip_cache
+ *  (optional) Switch to skip the cache. Defaults to FALSE.
+ * @return object
+ *  The object to be retrieved.
  */
-function panels_common_cache_get($obj, $did, $skip_cache = FALSE) {
+function panels_common_cache_get($obj, $did = NULL, $skip_cache = FALSE) {
   static $cache = array();
   $key = "$obj:$did";
   if ($skip_cache) {
@@ -332,11 +342,19 @@
 }
 
 /**
- * Save the edited display into the cache.
+ * Save an object into the cache.
+ * 
+ * @param string $obj
+ *  Type of object that is given in $data.  
+ * @param integer $did
+ *  (optional) Display ID, if the object given in $data is a display.
+ *  Defaults to NULL.
+ * @param object $data
+ *  The object to be cached.
  */
-function panels_common_cache_set($obj, $did, $cache) {
+function panels_common_cache_set($obj, $did = NULL, $data) {
   panels_common_cache_clear($obj, $did);
-  db_query("INSERT INTO {panels_object_cache} (sid, obj, did, data, timestamp) VALUES ('%s', '%s', %d, '%s', %d)", session_id(), $obj, $did, serialize($cache), time());
+  db_query("INSERT INTO {panels_object_cache} (sid, obj, did, data, timestamp) VALUES ('%s', '%s', %d, '%s', %d)", session_id(), $obj, $did, serialize($data), time());
 }
 
 /**
Index: panels/includes/common.inc
===================================================================
RCS file: /cvs/drupal/contributions/modules/panels/includes/Attic/common.inc,v
retrieving revision 1.1.2.27
diff -u -r1.1.2.27 common.inc
--- panels/includes/common.inc	27 May 2008 20:21:13 -0000	1.1.2.27
+++ panels/includes/common.inc	29 May 2008 18:28:16 -0000
@@ -888,7 +888,7 @@
  * Ajax entry point to add an context
  */
 function panels_common_ajax_context_item_add($module, $type, $panel_name) {
-  $object = panels_common_cache_get("panel_object:$module", $panel_name);
+  $object = panels_common_cache_get("panel_object:$module");
   if (!$object || !$type) {
     panels_ajax_render();
   }
@@ -945,7 +945,7 @@
 
     // Save changes
     $ref[$position] = $retval;
-    panels_common_cache_set("panel_object:$module", $panel_name, $object);
+    panels_common_cache_set("panel_object:$module", NULL, $object);
 
     // Build a chunk of the form to merge into the displayed form
     $arg_form[$type] = array(
@@ -996,7 +996,7 @@
  * Ajax entry point to edit an item
  */
 function panels_common_ajax_context_item_edit($module, $type, $panel_name) {
-  $object = panels_common_cache_get("panel_object:$module", $panel_name);
+  $object = panels_common_cache_get("panel_object:$module");
   if (!$object) {
     panels_ajax_render();
   }
@@ -1050,7 +1050,7 @@
 
     // Save changes
     $ref[$position] = $retval;
-    panels_common_cache_set("panel_object:$module", $panel_name, $object);
+    panels_common_cache_set("panel_object:$module", NULL, $object);
 
     $output->type = $output->output = 'dismiss';