diff --git a/features.module b/features.module
index 14ba7f7..e1b3c63 100644
--- a/features.module
+++ b/features.module
@@ -293,6 +293,8 @@ function features_modules_disabled($modules) {
     _features_restore('disable', $items);
     // Rebuild the list of features includes.
     features_include(TRUE);
+    // Make sure the static variables are reset.
+    features_get_components($component = NULL, $key = NULL, $reset = TRUE);
   }
 }
 
@@ -312,6 +314,8 @@ function features_modules_enabled($modules) {
     _features_restore('enable', $items);
     // Rebuild the list of features includes.
     features_include(TRUE);
+    // Make sure the static variables are reset.
+    features_get_components($component = NULL, $key = NULL, $reset = TRUE);
   }
 }