Fixes cache decorator issue

src/CacheableDecorator.php

@@ -48,10 +48,10 @@ private function generateCustomTags(Collection $tags, Model $object)
         $class = class_basename(get_class($object));
         $baseTags = (array) $this->repository->cacheTags();
 
-        $tags->push($class.':'.$object->getKey());
+        $tags->push($class . ':' . $object->getKey());
 
         foreach ($baseTags as $tag) {
-            $tags->push($tag.':'.$class.':'.$object->getKey());
+            $tags->push($tag . ':' . $class . ':' . $object->getKey());
         }
     }
 
@@ -76,6 +76,17 @@ private function generateTags($args)
         return $tags->sort()->unique()->all();
     }
 
+    /**
+     * Get the correct return value if the repository returns itself
+     *
+     * @param mixed $value
+     * @return mixed
+     */
+    private function getReturnValue($value)
+    {
+        return ($value === $this->repository) ? $this : $value;
+    }
+
     /**
      * Determine if the given object is a custom tag instance.
      *
@@ -122,10 +133,10 @@ public function __call($method, $args)
         }
 
         if (!$this->methodIsCacheable($method)) {
-            return call_user_func_array([$repository, $method], $args);
+            return $this->getReturnValue(call_user_func_array([$repository, $method], $args));
         }
 
-        return $this->service->retrieve(
+        return $this->getReturnValue($this->service->retrieve(
             $this->generateTags($args),
             $repository->cacheKey($method, $args),
             $repository->cacheDuration(),
@@ -134,6 +145,6 @@ function () use ($repository, $method, $args) {
 
                 return ($result !== null) ? $result : false;
             }
-        );
+        ));
     }
 }