diff --git a/admin_menu.inc b/admin_menu.inc
index b56a394..6951fe7 100644
--- a/admin_menu.inc
+++ b/admin_menu.inc
@@ -582,6 +582,11 @@ function admin_menu_theme_settings() {
   );
   // @todo Re-confirm this with latest browser versions.
   $form['admin_menu_position_fixed']['#description'] .= '<br /><strong>' . t('In some browsers, this setting may result in a malformed page, an invisible cursor, non-selectable elements in forms, or other issues.') . '</strong>';
+  $form['admin_menu_cache_client'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Cache menu in client-side browser'),
+    '#default_value' => variable_get('admin_menu_cache_client', 1),
+  );
 
   $form['tweaks'] = array(
     '#type' => 'fieldset',
diff --git a/admin_menu.module b/admin_menu.module
index cd90332..b97cb90 100644
--- a/admin_menu.module
+++ b/admin_menu.module
@@ -187,6 +187,10 @@ function admin_menu_page_build(&$page) {
 
   if ($setting = variable_get('admin_menu_margin_top', 1)) {
     $settings['margin_top'] = $setting;
+    // @todo Drupal.behaviors.adminMenuMarginTop is obsolete, but
+    //   hook_page_build() does not allow to set a CSS class on the body yet.
+    // @see http://drupal.org/node/1473548, http://drupal.org/node/1194528
+    //$page['#attributes']['class'][] = 'admin-menu';
   }
   if ($setting = variable_get('admin_menu_position_fixed', 0)) {
     $settings['position_fixed'] = $setting;