diff --git a/cache_control.js b/cache_control.js
index c482191..09fd920 100644
--- a/cache_control.js
+++ b/cache_control.js
@@ -19,7 +19,7 @@
         var force = settings.cacheControl.force || false;
         var authenticated = parseInt($.cookie('cacheControlAuthenticated'), 10);
 
-        if (authenticated || force) {
+        if ((authenticated || force) && settings.cacheControl.getComponents) {
           var path = settings.basePath + "_cache_control/get_components?_q=" + settings.cacheControl.q
           if (settings.cacheControl.query) {
             path += "&" + settings.cacheControl.query;
diff --git a/cache_control.module b/cache_control.module
index 24d5f0f..385e90f 100644
--- a/cache_control.module
+++ b/cache_control.module
@@ -861,6 +861,16 @@ function _cache_control_is_cached_pageload($set = NULL) {
       if (module_exists('captcha')) {
         $settings['processAnonymousCaptchaForms'] = !user_access('skip CAPTCHA', drupal_anonymous_user());
       }
+      
+      // check if there are any get components for this path
+      $path = $_GET['q'];
+      $get = $_GET;
+      unset($get['q']);
+      $query = http_build_query(drupal_get_query_parameters($get));
+      $page_components = cache_control_get_storage()->getPageComponents($path, $query);
+      if (count($page_components)) {
+        $settings['getComponents'] = TRUE;
+      }
 
       $settings['q'] = $_GET['q'];
       $settings['devMode'] = variable_get('cache_control_dev_mode', 0);
