Index: public/wp-includes/class-wp.php
===================================================================
--- public/wp-includes/class-wp.php	(revision 17468)
+++ public/wp-includes/class-wp.php	(working copy)
@@ -314,7 +314,7 @@
 		$status = null;
 		$exit_required = false;
 
-		if ( is_user_logged_in() )
+		if ( is_user_logged_in() || are_comment_cookies_set() )
 			$headers = array_merge($headers, wp_get_nocache_headers());
 		if ( !empty($this->query_vars['error']) && '404' == $this->query_vars['error'] ) {
 			$status = 404;
Index: public/wp-includes/comment.php
===================================================================
--- public/wp-includes/comment.php	(revision 17468)
+++ public/wp-includes/comment.php	(working copy)
@@ -1995,4 +1995,17 @@
 	return $open;
 }
 
-?>
+/**
+ * Check to see if any of the comment author cache cookies are set for this request
+ * 
+ * @return bool Whether or not they are.
+ */
+function are_comment_cookies_set() {
+	if ( isset($_COOKIE['comment_author_'.COOKIEHASH]) || isset($_COOKIE['comment_author_email_'.COOKIEHASH]) || isset($_COOKIE['comment_author_url_'.COOKIEHASH]) ) {
+		return true;
+	}
+
+	return false;
+}
+
+?>
\ No newline at end of file