diff --git a/README.txt b/README.txt
index a26da48792c8c5ea6876e88895cf3d65ff732af6..df4e5eeb658b8d8c8cef98c5457490dbccdcb0fd 100644
--- a/README.txt
+++ b/README.txt
@@ -146,4 +146,5 @@ CREDITS
 -------
 Developed and maintained by Arto Bendiken <http://bendiken.net/>
 Ported to Drupal 5.x by Alexander I. Grafov <http://drupal.ru/>
-Miscellaneous contributions by: Jacob Peddicord, Justin Miller.
+Miscellaneous contributions by: Jacob Peddicord, Justin Miller, Barry
+Jaspan.
diff --git a/boost.module b/boost.module
index e343607a95cc34898183dc0dec9381f48969fdf8..96057b5fb13864ec2817199411587e20640b908d 100644
--- a/boost.module
+++ b/boost.module
@@ -158,16 +158,16 @@ function boost_exit($destination = NULL) {
     global $user;
     if (empty($user->uid) && ($messages = drupal_set_message())) {
 
-      // Check that the page we're redirecting to has been cached by Boost
-      // and really necessitates special handling:
+      // Check that the page we're redirecting to really necessitates
+      // special handling, i.e. it doesn't have a query string:
       extract(parse_url($destination));
       $path = ($path == base_path() ? '' : substr($path, strlen(base_path())));
-      if (boost_is_cached($path) && empty($query)) {
-        // FIXME: call any remaining exit hooks since we're about to terminate.
+      if (empty($query)) {
+        // FIXME: call any remaining exit hooks since we're about to terminate?
 
-        // Add a query string to ensure we don't serve a static copy of
-        // the page we're redirecting to, which would prevent the session
-        // messages from showing up:
+        // If no query string was previously set, add one just to ensure we
+        // don't serve a static copy of the page we're redirecting to, which
+        // would prevent the session messages from showing up:
         $destination = url($path, 't=' . time(), $fragment, TRUE);
 
         // Do what drupal_goto() would do if we were to return to it: