diff --git a/CHANGES b/CHANGES
index 3ff91417c3..a751e4219b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) mod_disk_cache: Do not store hop-by-hop headers.  [Justin Erenkrantz]
+
   *) mod_cache: Try to correctly follow RFC 2616 13.3 on validating stale
      cache responses.  [Justin Erenkrantz]
 
diff --git a/modules/experimental/mod_disk_cache.c b/modules/experimental/mod_disk_cache.c
index c835f6f193..6ec6fd9e04 100644
--- a/modules/experimental/mod_disk_cache.c
+++ b/modules/experimental/mod_disk_cache.c
@@ -625,7 +625,10 @@ static apr_status_t store_headers(cache_handle_t *h, request_rec *r, cache_info
         /* Make call to the same thing cache_select_url calls to crack Vary. */
         /* @@@ Some day, not today. */
         if (r->headers_in) {
-            rv = store_table(dobj->hfd, r->headers_in);
+            apr_table_t *headers_in;
+
+            headers_in = ap_cache_cacheable_hdrs_out(r->pool, r->headers_in);
+            rv = store_table(dobj->hfd, headers_in);
             if (rv != APR_SUCCESS) {
                 return rv;
             }