diff --git a/src/cache.c b/src/cache.c
index 32f2e471c3..b291aff4cf 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -1783,12 +1783,23 @@ static void http_cache_io_handler(struct appctx *appctx)
 	unsigned int len;
 	size_t ret;
 
-	if (applet_fl_test(appctx, APPCTX_FL_OUTBLK_ALLOC|APPCTX_FL_OUTBLK_FULL))
+	if (applet_fl_test(appctx, APPCTX_FL_INBLK_ALLOC|APPCTX_FL_OUTBLK_ALLOC|APPCTX_FL_OUTBLK_FULL))
 		goto exit;
 
 	if (applet_fl_test(appctx, APPCTX_FL_FASTFWD) && se_fl_test(appctx->sedesc, SE_FL_MAY_FASTFWD_PROD))
 		goto exit;
 
+	if (appctx->st0 == HTX_CACHE_INIT) {
+		if (!appctx_get_buf(appctx, &appctx->inbuf) || htx_is_empty(htxbuf(&appctx->inbuf)))
+			goto wait_request;
+
+		ctx->next = block_ptr(cache_ptr);
+		ctx->offset = sizeof(*cache_ptr);
+		ctx->sent = 0;
+		ctx->rem_data = 0;
+		appctx->st0 = HTX_CACHE_HEADER;
+	}
+
 	if (!appctx_get_buf(appctx, &appctx->outbuf)) {
 		goto exit;
 	}
@@ -1802,14 +1813,6 @@ static void http_cache_io_handler(struct appctx *appctx)
 	len = first->len - sizeof(*cache_ptr) - ctx->sent;
 	res_htx = htx_from_buf(&appctx->outbuf);
 
-	if (appctx->st0 == HTX_CACHE_INIT) {
-		ctx->next = block_ptr(cache_ptr);
-		ctx->offset = sizeof(*cache_ptr);
-		ctx->sent = 0;
-		ctx->rem_data = 0;
-		appctx->st0 = HTX_CACHE_HEADER;
-	}
-
 	if (appctx->st0 == HTX_CACHE_HEADER) {
 		struct ist meth;
 
@@ -1884,6 +1887,11 @@ static void http_cache_io_handler(struct appctx *appctx)
 	appctx->sedesc->iobuf.flags &= ~IOBUF_FL_FF_BLOCKED;
 	return;
 
+  wait_request:
+	/* Wait for the request before starting to deliver the response */
+	applet_need_more_data(appctx);
+	return;
+
   error:
 	/* Sent and HTTP error 500 */
 	b_reset(&appctx->outbuf);
diff --git a/src/stats-html.c b/src/stats-html.c
index 23cfb91a0d..dc3dfa6f8f 100644
--- a/src/stats-html.c
+++ b/src/stats-html.c
@@ -1973,6 +1973,11 @@ static void http_stats_io_handler(struct appctx *appctx)
 	if (applet_fl_test(appctx, APPCTX_FL_FASTFWD) && se_fl_test(appctx->sedesc, SE_FL_MAY_FASTFWD_PROD))
 		goto out;
 
+	if (appctx->st0 != STAT_HTTP_END) {
+		if (!appctx_get_buf(appctx, &appctx->inbuf) || htx_is_empty(htxbuf(&appctx->inbuf)))
+			goto wait_request;
+	}
+
 	if (!appctx_get_buf(appctx, &appctx->outbuf)) {
 		goto out;
 	}
@@ -2062,6 +2067,13 @@ static void http_stats_io_handler(struct appctx *appctx)
 	}
 	else if (applet_fl_test(appctx, APPCTX_FL_OUTBLK_FULL))
 		applet_wont_consume(appctx);
+	return;
+
+  wait_request:
+	/* Wait for the request before starting to deliver the response */
+	applet_need_more_data(appctx);
+	return;
+
 }
 
 static size_t http_stats_fastfwd(struct appctx *appctx, struct buffer *buf,