Merge pull request #302 from titrxw/master

Unification of whether to turn on cache detection
mikebronner · Dec 22, 2019 · c02b11e · c02b11e
2 parents 5cf2c86 + b2a8f20
commit c02b11e
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/src/Traits/ModelCaching.php b/src/Traits/ModelCaching.php
@@ -40,16 +40,13 @@ public function __set($key, $value)
 
     public static function all($columns = ['*'])
     {
-        $cacheIsEnabled = Container::getInstance()
-            ->make("config")
-            ->get("laravel-model-caching.enabled");
-
-        if (! $cacheIsEnabled) {
-            return parent::all($columns);
-        }
-
         $class = get_called_class();
         $instance = new $class;
+
+	    if (!$instance->isCachable()) {
+		    return parent::all($columns);
+	    }
+
         $tags = $instance->makeCacheTags();
         $key = $instance->makeCacheKey();