From 70d7c5355746b4997455aba4950d1b0d4b048ae5 Mon Sep 17 00:00:00 2001
From: Fenny <25108519+Fenny@users.noreply.github.com>
Date: Thu, 29 Oct 2020 06:38:41 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=A9=B9=20fix=20race=20condition?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 middleware/cache/cache.go      | 6 +++++-
 middleware/cache/cache_test.go | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/middleware/cache/cache.go b/middleware/cache/cache.go
index 322e21fa..cf9955d6 100644
--- a/middleware/cache/cache.go
+++ b/middleware/cache/cache.go
@@ -178,8 +178,12 @@ func New(config ...Config) fiber.Handler {
 			}
 
 		} else {
+			if cfg.defaultStore {
+				c.Response().SetBodyRaw(entry.body)
+			} else {
+				c.Response().SetBodyRaw(entryBody)
+			}
 			// Set response headers from cache
-			c.Response().SetBodyRaw(entryBody)
 			c.Response().SetStatusCode(entry.status)
 			c.Response().Header.SetContentTypeBytes(entry.cType)
 
diff --git a/middleware/cache/cache_test.go b/middleware/cache/cache_test.go
index d147d73d..16290a8f 100644
--- a/middleware/cache/cache_test.go
+++ b/middleware/cache/cache_test.go
@@ -311,7 +311,6 @@ func (s testStore) Set(id string, val []byte, _ time.Duration) error {
 	s.mutex.Lock()
 	s.stmap[id] = val
 	s.mutex.Unlock()
-
 	return nil
 }