diff --git a/app/Http/Controllers/TextureController.php b/app/Http/Controllers/TextureController.php
index 4c315426..a8ed5958 100644
--- a/app/Http/Controllers/TextureController.php
+++ b/app/Http/Controllers/TextureController.php
@@ -214,21 +214,17 @@ class TextureController extends Controller
         $hash = $player->getTexture('skin');
         if (Storage::disk('textures')->has($hash)) {
             $key = "avatar-{$hash}-{$size}";
-            $content = Cache::rememberForever($key, function () use ($hash, $size) {
-                $png = Minecraft::generateAvatarFromSkin(
-                    Storage::disk('textures')->read($hash),
-                    $size
-                );
-                ob_start();
-                imagepng($png);
-                $image = ob_get_contents();
-                ob_end_clean();
-                imagedestroy($png);
+            $png = Minecraft::generateAvatarFromSkin(
+                Storage::disk('textures')->read($hash),
+                $size
+            );
+            ob_start();
+            imagepng($png);
+            $image = ob_get_contents();
+            ob_end_clean();
+            imagedestroy($png);
 
-                return $image;
-            });
-
-            return response($content)->withHeaders(['content-type' => 'image/png']);
+            return Response::png($image);
         }
 
         return abort(404);
diff --git a/tests/TextureControllerTest.php b/tests/TextureControllerTest.php
index a9b62b3d..255daac6 100644
--- a/tests/TextureControllerTest.php
+++ b/tests/TextureControllerTest.php
@@ -305,10 +305,9 @@ class TextureControllerTest extends TestCase
         $this->get("/avatar/player/1/{$player->name}.png")->assertNotFound();
 
         // Success
-        Storage::disk('textures')->putFileAs(
-            '.',
-            UploadedFile::fake()->image('avatar.png', 64, 64),
-            $texture->hash
+        Storage::disk('textures')->put(
+            $texture->hash,
+            file_get_contents(resource_path('assets/src/images/textures/steve.png'))
         );
         $this->get("/avatar/player/20/{$player->name}.png")
             ->assertSuccessful();