diff --git a/CHANGES b/CHANGES
index a082636269..f6454f4348 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.43
 
+  *) Make mod_cache's CacheMaxStreamingBuffer directive work
+     properly for virtual hosts that override server-wide mod_cache
+     setttings.  [Matthieu Estrade <estrade-m@ifrance.com>]
+
   *) Add ap_register_provider/ap_lookup_provider API.
      [John K. Sterling <john@sterls.com>, Justin Erenkrantz]
 
diff --git a/modules/experimental/mod_cache.c b/modules/experimental/mod_cache.c
index fcbb6676e2..78d34c04c3 100644
--- a/modules/experimental/mod_cache.c
+++ b/modules/experimental/mod_cache.c
@@ -919,6 +919,10 @@ static void * merge_cache_config(apr_pool_t *p, void *basev, void *overridesv)
         (overrides->ignorecachecontrol_set == 0)
         ? base->ignorecachecontrol
         : overrides->ignorecachecontrol;
+    ps->max_streaming_buffer_size  =
+        (overrides->max_streaming_buffer_size == 0)
+        ? base->max_streaming_buffer_size
+        : overrides->max_streaming_buffer_size;
 
     return ps;
 }