diff --git plugins/views_plugin_access.inc plugins/views_plugin_access.inc
index 5d30687..8dc4200 100644
--- plugins/views_plugin_access.inc
+++ plugins/views_plugin_access.inc
@@ -27,10 +27,10 @@ class views_plugin_access extends views_plugin {
   }
 
   /**
-   * Retrieve the default options when this is a new access
+   * Retrieve the options when this is a new access
    * control plugin
    */
-  function option_defaults(&$options) { }
+  function option_definition() { return array(); }
 
   /**
    * Provide the default form for setting options.
diff --git plugins/views_plugin_access_perm.inc plugins/views_plugin_access_perm.inc
index 7466fec..9ef7b4c 100644
--- plugins/views_plugin_access_perm.inc
+++ plugins/views_plugin_access_perm.inc
@@ -17,8 +17,12 @@ class views_plugin_access_perm extends views_plugin_access {
     return t($this->options['perm']);
   }
 
-  function option_defaults(&$options) {
-    $options['perm'] = 'access content';
+
+  function option_definition() {
+    $options = parent::option_definition();
+    $options['perm'] = array('default' => 'access content');
+
+    return $options;
   }
 
   function options_form(&$form, &$form_state) {
diff --git plugins/views_plugin_access_role.inc plugins/views_plugin_access_role.inc
index 4015dbd..feee15f 100644
--- plugins/views_plugin_access_role.inc
+++ plugins/views_plugin_access_role.inc
@@ -30,8 +30,12 @@ class views_plugin_access_role extends views_plugin_access {
     }
   }
 
-  function option_defaults(&$options) {
-    $options['role'] = array();
+
+  function option_definition() {
+    $options = parent::option_definition();
+    $options['role'] = array('default' => array());
+
+    return $options;
   }
 
   function options_form(&$form, &$form_state) {
diff --git plugins/views_plugin_cache.inc plugins/views_plugin_cache.inc
index e361019..dec5167 100644
--- plugins/views_plugin_cache.inc
+++ plugins/views_plugin_cache.inc
@@ -37,12 +37,6 @@ class views_plugin_cache extends views_plugin {
   }
 
   /**
-   * Retrieve the default options when this is a new access
-   * control plugin
-   */
-  function option_defaults(&$options) { }
-
-  /**
    * Return a string to display as the clickable title for the
    * access control.
    */
diff --git plugins/views_plugin_cache_time.inc plugins/views_plugin_cache_time.inc
index 51b95b7..b8066c5 100644
--- plugins/views_plugin_cache_time.inc
+++ plugins/views_plugin_cache_time.inc
@@ -5,9 +5,12 @@
  * Simple caching of query results for Views displays.
  */
 class views_plugin_cache_time extends views_plugin_cache {
-  function option_defaults(&$options) {
-    $options['results_lifespan'] = 3600;
-    $options['output_lifespan'] = 3600;
+  function option_definition() {
+    $options = parent::option_definition();
+    $options['results_lifespan'] = array('default' => 3600);
+    $options['output_lifespan'] = array('default' => 3600);
+
+    return $options;
   }
 
   function options_form(&$form, &$form_state) {
diff --git plugins/views_plugin_display.inc plugins/views_plugin_display.inc
index cd1b428..67c9cb6 100644
--- plugins/views_plugin_display.inc
+++ plugins/views_plugin_display.inc
@@ -1596,7 +1596,6 @@ class views_plugin_display extends views_plugin {
           $plugin = views_get_plugin('access', $form_state['values']['access']['type']);
           if ($plugin) {
             $access = array('type' => $form_state['values']['access']['type']);
-            $plugin->option_defaults($access);
             $this->set_option('access', $access);
             if (!empty($plugin->definition['uses options'])) {
               views_ui_add_form_to_stack('display', $this->view, $this->display->id, array('access_options'));
@@ -1618,7 +1617,6 @@ class views_plugin_display extends views_plugin {
           $plugin = views_get_plugin('cache', $form_state['values']['cache']['type']);
           if ($plugin) {
             $cache = array('type' => $form_state['values']['cache']['type']);
-            $plugin->option_defaults($cache);
             $this->set_option('cache', $cache);
             if (!empty($plugin->definition['uses options'])) {
               views_ui_add_form_to_stack('display', $this->view, $this->display->id, array('cache_options'));