diff --git a/app/Http/Controllers/PublicController.php b/app/Http/Controllers/PublicController.php
index 260c875..0a472d6 100644
--- a/app/Http/Controllers/PublicController.php
+++ b/app/Http/Controllers/PublicController.php
@@ -51,18 +51,15 @@ class PublicController extends BaseController
         //File exists in the right size
         if (Storage::disk('cache')->exists($cacheName."_".$size)) {
             Log::info("Get from Cache");
-
             $this->addAccessLog($tenant->id, $gallery->id, $image->id, "Cache", Storage::disk('cache')->size($cacheName."_".$size));
+            Log::info("Return from Cache, Gesamtzeit: ".(microtime(true)-$globalstart));
             return Storage::disk('cache')->response($cacheName."_".$size, null, ['Cache-Control'=> 'max-age='.(60*60*24).', public']);
         }
 
         //If File exists in the needed format return
         $file = null;
-        if (Storage::disk('cache')->exists($cacheName."_".$size)) {
+        if (Storage::disk('cache')->exists($cacheName."_orginal")) {
             $file = Storage::disk("cache")->get($cacheName."_orginal");
-            $this->addAccessLog($tenant->id, $gallery->id, $image->id, "Cache", $image->size);
-            Log::info("Return from Cache, Gesamtzeit: ".(microtime(true)-$globalstart));
-            return Storage::disk('cache')->response($cacheName."_".$size);
         } else {
             Log::info("Get from S3");
             $start = microtime(true);