diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 1856bfc51..9ecb34500 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -8,6 +8,7 @@
  - fix [ 1328728 ] Export exports root page n times
  - fix [ 1338306 ] adminConsoleHelpIcon displayed at wrong position
  - fix [ 1216810 ] anonymous registration errors persist (fixed for real!)
+ - fix [ 1237406 ] HTTP Proxy caches results
  - fix 
 [ 1365822 ] makePrintable does not work in Collaboration System
  - fix [ 1376621 ] dateSubmitted not updated on posts
diff --git a/lib/WebGUI/Asset/Wobject/HttpProxy.pm b/lib/WebGUI/Asset/Wobject/HttpProxy.pm
index dce25248c..2cbddfa79 100644
--- a/lib/WebGUI/Asset/Wobject/HttpProxy.pm
+++ b/lib/WebGUI/Asset/Wobject/HttpProxy.pm
@@ -326,9 +326,10 @@ sub view {
       } else {
           $ttl = $session{page}{cacheTimeout};
       }
-
-   $cachedContent->set($var{content},$ttl);
-   $cachedHeader->set($var{header},$ttl);
+		unless ($self->get("cacheTimeoutVisitor") <= 1 && $self->get("cacheTimeout") <= 1) {
+	   $cachedContent->set($var{content},$ttl);
+	   $cachedHeader->set($var{header},$ttl);
+	  }
    }
 
    if($var{header} ne "text/html") {