diff --git a/views_content/plugins/views/views_content_plugin_display_panel_pane.inc b/views_content/plugins/views/views_content_plugin_display_panel_pane.inc
index bfc77e0..230af56 100644
--- a/views_content/plugins/views/views_content_plugin_display_panel_pane.inc
+++ b/views_content/plugins/views/views_content_plugin_display_panel_pane.inc
@@ -50,9 +50,20 @@ class views_content_plugin_display_panel_pane extends views_plugin_display {
 
   function set_pane_conf($conf = array(), $set_cache = TRUE) {
     $this->set_option('pane_conf', $conf);
-    $this->view->dom_id = !empty($this->view->dom_id) ? $this->view->dom_id : md5($this->view->name . REQUEST_TIME . rand());
+    if (empty($this->view->cid)) {
+      global $language;
+      global $user;
+      $cid_head = 'view_panel_pane:';
+      $cid_name = $this->view->name;
+      $cid_disp = $this->view->current_display;
+      $cid_args = serialize($this->view->args);
+      $cid_lang = $language->language;
+      $cid_uid = $user->uid;
+      $cid_md5 = md5($cid_name . '_' . $cid_disp . '_' . $cid_args . '_' . $cid_lang . '_' . $cid_uid);
+      $this->view->cid = $cid_head . $cid_md5;
+    }
     if ($set_cache) {
-      cache_set('view_panel_pane_' . $this->view->dom_id, $conf);
+      cache_set($this->view->cid, $conf, 'cache_views');
     }
     $this->has_pane_conf = TRUE;
   }
@@ -425,14 +436,13 @@ class views_content_plugin_display_panel_pane extends views_plugin_display {
     ctools_include('context');
     $conf = $this->get_option('pane_conf');
     if (!$conf) {
-      // See if dom id has been cached and get conf from there.
-      if (!empty($this->view->dom_id) && ($cache = cache_get('view_panel_pane_' . $this->view->dom_id))) {
+      // See if cache id has been cached and get conf from there.
+      if (!empty($this->view->cid) && ($cache = cache_get($this->view->cid, 'cache_views'))) {
         $conf = $cache->data;
       }
       if (!$conf) {
         return;
       }
-      $this->set_pane_conf($conf);
     }
     $contexts = $conf['pane_contexts'];
     $panel_args = $conf['panel_args'];