diff --git a/includes/common.inc b/includes/common.inc
index 4b2eac8..c47a45b 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -119,7 +119,7 @@ function panelizer_default_context_form($form, &$form_state) {
     '#suffix' => '</div></div>',
   );
 
-  $module = 'panelizer-' . $form_state['panelizer type'];
+  $module = 'panelizer_context::' . $form_state['panelizer type'];
   ctools_context_add_context_form($module, $form, $form_state, $form['right']['contexts_table'], $panelizer, $form_state['cache key']);
   ctools_context_add_relationship_form($module, $form, $form_state, $form['right']['relationships_table'], $panelizer, $form_state['cache key']);
 
diff --git a/panelizer.module b/panelizer.module
index 56964f0..a30fc9a 100644
--- a/panelizer.module
+++ b/panelizer.module
@@ -697,7 +697,7 @@ function panelizer_get_contexts($panelizer, $object = NULL) {
  * where our task_handler plugins are.
  */
 function panelizer_ctools_plugin_directory($owner, $plugin_type) {
-  if ($owner == 'page_manager') {
+  if (in_array($owner, array('ctools', 'page_manager'))) {
     return 'plugins/' . $plugin_type;
   }
 }
diff --git a/plugins/cache/panelizer_context.inc b/plugins/cache/panelizer_context.inc
new file mode 100644
index 0000000..a6c2d93
--- /dev/null
+++ b/plugins/cache/panelizer_context.inc
@@ -0,0 +1,9 @@
+<?php
+
+$plugin = array(
+  'title' => t('Panelizer context'),
+  'cache get' => 'panelizer_context_cache_get',
+  'cache set' => 'panelizer_context_cache_set',
+  'cache clear' => 'panelizer_context_cache_clear',
+  'cache finalize' => 'panelizer_context_cache_set',
+);