diff --git a/src/Contentful.php b/src/Contentful.php
index b1a14f9..bcbc85d 100644
--- a/src/Contentful.php
+++ b/src/Contentful.php
@@ -586,8 +586,12 @@ function ($builtResponse) use ($test) {
                 //save into cache
                 if ($api !== self::CONTENT_MANAGEMENT_API) {
                     $isSuccessResponseData = !$unavailableException && $isValidResponse;
-                    $writeCacheItem->set($responseJson);
-                    $writeCache->save($writeCacheItem);
+
+                    if ($isSuccessResponseData || $this->cacheFailResponses) {
+                        $writeCacheItem->set($responseJson);
+                        $writeCache->save($writeCacheItem);
+                    }
+
                     if (!isset($fallbackCacheItem)) {
                         /**
                          * @var CacheItemInterface $fallbackCacheItem