Clean up disabling of cache

Author: mikebronner

src/Traits/Cachable.php

@@ -11,7 +11,6 @@
 trait Cachable
 {
     protected $isCachable = true;
-    protected static $isCachableKey = 'genealabs:laravel-model-caching:is-disabled';
 
     protected function cache(array $tags = [])
     {
@@ -43,8 +42,6 @@ protected function addTagsWhenCalledFromCachedBuilder(array $tags) : array
 
     public function disableCache()
     {
-        cache()->forever(self::$isCachableKey, true);
-
         $this->isCachable = false;
 
         return $this;
@@ -89,10 +86,6 @@ public static function bootCachable()
 
     public static function all($columns = ['*'])
     {
-        if (! cache()->get(self::$isCachableKey)) {
-            return parent::all($columns);
-        }
-
         $class = get_called_class();
         $instance = new $class;
         $tags = [str_slug(get_called_class())];
@@ -106,8 +99,8 @@ public static function all($columns = ['*'])
 
     public function newEloquentBuilder($query)
     {
-        if (cache()->get(self::$isCachableKey)) {
-            cache()->forget(self::$isCachableKey);
+        if (! $this->isCachable) {
+            $this->isCachable = true;
 
             return new EloquentBuilder($query);
         }