Don't cache groups (#641)

volkszaehler · Oct 15, 2017 · 1efdbbd · 1efdbbd
1 parent bb8ca52
commit 1efdbbd
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/lib/Util/EntityFactory.php b/lib/Util/EntityFactory.php
@@ -28,6 +28,7 @@
 
 use Volkszaehler\Util;
 use Volkszaehler\Definition\PropertyDefinition;
+use Volkszaehler\Model\Aggregator;
 
 /**
  * Entity factory
@@ -219,14 +220,18 @@ public function remove($key) {
 	 *
 	 * @throws Exception
 	 */
-	protected function cached($key, $cache, $callable) {
+	private function cached($key, $cache, $callable) {
 		if ($cache && $this->cache->contains($key)) {
-			return $this->cache->fetch($key);
+			$entity = $this->cache->fetch($key);
+
+			if (!$entity instanceof Aggregator) {
+				return $entity;
+			}
 		}
 
 		$entity = $callable();
 
-		if (isset($entity) && $cache) {
+		if ($cache && isset($entity) &! $entity instanceof Aggregator) {
 			if (!isset($this->ttl)) {
 				$this->ttl = Util\Configuration::read('cache.ttl', 3600);
 			}