diff --git a/base.go b/base.go
index 488d66e..9c7d130 100644
--- a/base.go
+++ b/base.go
@@ -2,6 +2,7 @@ package gql
 
 import (
 	"crypto/tls"
+	"fmt"
 	"time"
 
 	"github.com/allegro/bigcache"
@@ -103,11 +104,13 @@ func (b *BaseClient) enableCache() {
 	var err error
 	b.cache.client, err = bigcache.NewBigCache(bigcache.DefaultConfig(time.Duration(b.cache.ttl) * time.Second))
 	if err != nil {
-		b.Logger.Error(b, "Error while creating cache client;", "error", err.Error())
+		fmt.Println(">> Error while creating cache client;", "error", err.Error())
+		panic(err)
 	}
 }
 
 func (b *BaseClient) disableCache() {
+	b.Logger.Debug(b, "Disabling cache")
 	b.cache.enabled = false
 	b.cache.client = nil
 }
diff --git a/query.go b/query.go
index e76c6ba..daba7e4 100644
--- a/query.go
+++ b/query.go
@@ -3,7 +3,6 @@ package gql
 import (
 	"context"
 	"fmt"
-	"reflect"
 	"strconv"
 
 	"github.com/lukaszraczylo/go-simple-graphql/utils/helpers"
@@ -80,18 +79,17 @@ func (c *BaseClient) Query(queryContent string, queryVariables interface{}, quer
 
 	// Check for library specific headers
 	if len(queryHeaders) > 0 {
-		queryHeadersModified, cache_enabled := c.parseQueryHeaders(queryHeaders)
+		queryHeadersModified, cache_enabled, headers_modified := c.parseQueryHeaders(queryHeaders)
 
-		if !reflect.DeepEqual(queryHeadersModified, queryHeaders) {
-			if queryHeadersModified["gqlcache"] != nil && c.cache.enabled != cache_enabled {
-				c.Logger.Debug(c, "Switching cache on as per single-request header")
+		if headers_modified {
+			queryHeaders = queryHeadersModified
+			c.Logger.Debug(c, fmt.Sprintf("Switching cache %s as per single-request header", strconv.FormatBool(cache_enabled)))
+			if cache_enabled {
 
-				// Create a new BaseClient instance with the same settings as c, but with the cache enabled/disabled as required
-				if cache_enabled {
-					localClient.enableCache()
-				} else {
-					localClient.disableCache()
-				}
+				// this doesn't make sense - cache is created but its ttl is longer than query execution so it'll be disappeared before it's used
+				localClient.enableCache()
+			} else {
+				localClient.disableCache()
 			}
 		}
 	}
@@ -121,7 +119,7 @@ func (c *BaseClient) Query(queryContent string, queryVariables interface{}, quer
 		return nil, err
 	}
 
-	if localClient.cache.enabled && jsonData != nil && queryHash != "" {
+	if localClient.cache.enabled && c.cache.client != nil && jsonData != nil && queryHash != "" {
 		err = c.cache.client.Set(queryHash, jsonData)
 		if err != nil {
 			c.Logger.Error(c, "Error while setting cache key;", "error", err.Error())
@@ -155,12 +153,12 @@ func (c *BaseClient) decodeResponse(jsonData []byte) any {
 	}
 }
 
-func (c *BaseClient) parseQueryHeaders(queryHeaders map[string]interface{}) (returnHeaders map[string]interface{}, cache_enabled bool) {
+func (c *BaseClient) parseQueryHeaders(queryHeaders map[string]interface{}) (returnHeaders map[string]interface{}, cache_enabled bool, headers_modified bool) {
 	returnHeaders = make(map[string]interface{})
 	for k, v := range queryHeaders {
 		if k == "gqlcache" {
-			c.cache.enabled, _ = strconv.ParseBool(fmt.Sprintf("%v", v))
-			cache_enabled = true
+			cache_enabled, _ = strconv.ParseBool(fmt.Sprintf("%v", v))
+			headers_modified = true
 			continue
 		}
 		if k == "gqlretries" {
@@ -169,5 +167,5 @@ func (c *BaseClient) parseQueryHeaders(queryHeaders map[string]interface{}) (ret
 		}
 		returnHeaders[k] = v
 	}
-	return returnHeaders, cache_enabled
+	return returnHeaders, cache_enabled, headers_modified
 }
diff --git a/query_test.go b/query_test.go
index c9afaea..1c5bd6e 100644
--- a/query_test.go
+++ b/query_test.go
@@ -334,7 +334,7 @@ func TestBaseClient_parseQueryHeaders(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			c := NewConnection()
-			if gotReturnHeaders, _ := c.parseQueryHeaders(tt.args.queryHeaders); !reflect.DeepEqual(gotReturnHeaders, tt.wantReturnHeaders) {
+			if gotReturnHeaders, _, _ := c.parseQueryHeaders(tt.args.queryHeaders); !reflect.DeepEqual(gotReturnHeaders, tt.wantReturnHeaders) {
 				t.Errorf("BaseClient.parseQueryHeaders() = %v, want %v", gotReturnHeaders, tt.wantReturnHeaders)
 			}
 		})