diff --git a/cacheaudit.drush.inc b/cacheaudit.drush.inc
index d1949f5..44dc273 100644
--- a/cacheaudit.drush.inc
+++ b/cacheaudit.drush.inc
@@ -231,22 +231,55 @@ function views_cacheaudit() {
 /**
  * Implements hook_cacheaudit().
  *
- * Implemented on behalf of the Panels module.
+ * Implemented on behalf of the Page Manager module.
  */
-function panels_cacheaudit() {
+function page_manager_cacheaudit() {
   $results = array();
-  $results[] = array('Panel', 'Pane', 'Region', 'Cache', 'Lifetime', 'Granulairty');
+
+  $cache_lifetime_values = array(
+    0 => dt('<none>'),
+    15 => dt('15s'),
+    30 => dt('30s'),
+    60 => dt('1 min'),
+    120 => dt('2 min'),
+    180 => dt('3 min'),
+    240 => dt('4 min'),
+    300 => dt('5 min'),
+    600 => dt('10 min'),
+    900 => dt('15 min'),
+    1200 => dt('20 min'),
+    1800 => dt('30 min'),
+    2700 => dt('45 min'),
+    3600 => dt('1 hour'),
+    7200 => dt('2 hour'),
+    10800 => dt('3 hours'),
+    14400 => dt('4 hours'),
+    21600 => dt('6 hours'),
+    28800 => dt('8 hours'),
+    32400 => dt('9 hours'),
+    43200 => dt('12 hours'),
+    86400 => dt('1 day'),
+    172800 => dt('2 days'),
+    259200 => dt('3 days'),
+    345600 => dt('4 days'),
+    604800 => dt('1 week'),
+  );
 
   foreach (_cacheaudit_get_panels() as $name => $panes) {
     foreach ($panes as $pane) {
       $cache = isset($pane->cache['method']) ? $pane->cache['method'] : '';
-      $lifetime = isset($pane->cache['method']) ? $pane->cache['settings']['lifetime'] : '';
+      $lifetime = isset($pane->cache['method']) ? $cache_lifetime_values[$pane->cache['settings']['lifetime']] : '';
       $granularity = isset($pane->cache['method']) ? var_export($pane->cache['settings']['granularity'], TRUE) : '<not set>';
       $results[] = array($name, $pane->subtype, $pane->panel, $cache, $lifetime, $granularity);
     }
   }
 
-  return array('panels' => $results);
+  if (!empty($results)) {
+    array_unshift($results, array('Panel', 'Pane', 'Region', 'Cache', 'Lifetime', 'Granularity'));
+    return array('panels' => $results);
+  }
+
+  return array();
 }
 
 /**
@@ -276,7 +309,7 @@ function _cacheaudit_get_panels() {
           // Fetch available panes.
           $handler_panes = _cacheaudit_load_panes($handler, $title);
           foreach ($handler_panes as $pane_key => $handler_pane) {
-            $available_handlers[$handler->name][$pane_key] = $handler_pane;
+            $available_handlers[$handler->conf['title']][$pane_key] = $handler_pane;
           }
         }
       }
@@ -293,7 +326,7 @@ function _cacheaudit_get_panels() {
           // Fetch available panes.
           $handler_panes = _cacheaudit_load_panes($handler, $title);
           foreach ($handler_panes as $pane_key => $handler_pane) {
-            $available_handlers[$handler->name][$pane_key] = $handler_pane;
+            $available_handlers[$handler->conf['title']][$pane_key] = $handler_pane;
           }
         }
       }
@@ -317,7 +350,13 @@ function _cacheaudit_load_panes($handler) {
   else if (!empty($handler->conf['display'])) {
     $display = $handler->conf['display'];
   }
-
+  if (isset($display->content)) {
+    foreach($display->content as $content) {
+      if (!count($content->cache)) {
+        $content->cache = $display->cache;
+      }
+    }
+  }
   return isset($display->content) ? $display->content : array();
 }