diff --git a/lib/rails_ext/active_storage_authorization.rb b/lib/rails_ext/active_storage_authorization.rb
index 55d0de3bc..7d6fa8510 100644
--- a/lib/rails_ext/active_storage_authorization.rb
+++ b/lib/rails_ext/active_storage_authorization.rb
@@ -40,6 +40,10 @@ Rails.application.config.to_prepare do
           head :forbidden
         end
       end
+
+      def http_cache_forever(public: false, &block)
+        super(public: public && publicly_accessible_blob?, &block)
+      end
   end
 
   ActiveStorage::Blobs::RedirectController.include ActiveStorage::Authorize
diff --git a/test/integration/active_storage_authorization_test.rb b/test/integration/active_storage_authorization_test.rb
index 1ebb35feb..605bc109d 100644
--- a/test/integration/active_storage_authorization_test.rb
+++ b/test/integration/active_storage_authorization_test.rb
@@ -150,6 +150,38 @@ class ActiveStorageAuthorizationTest < ActionDispatch::IntegrationTest
     assert_match %r{rails/active_storage}, response.location
   end
 
+  test "proxy for non-public blob does not set public Cache-Control" do
+    sign_in_as :david
+
+    get rails_storage_proxy_path(@blob)
+    assert_response :success
+    assert_not_includes response.headers["Cache-Control"], "public"
+  end
+
+  test "proxy for publicly accessible blob sets public Cache-Control" do
+    blob = attach_avatar_to(users(:david))
+
+    get rails_storage_proxy_path(blob)
+    assert_response :success
+    assert_includes response.headers["Cache-Control"], "public"
+  end
+
+  test "representation proxy for non-public blob does not set public Cache-Control" do
+    sign_in_as :david
+
+    get rails_storage_proxy_path(@blob.representation(resize_to_limit: [ 100, 100 ]))
+    assert_response :success
+    assert_not_includes response.headers["Cache-Control"], "public"
+  end
+
+  test "representation proxy for publicly accessible blob sets public Cache-Control" do
+    blob = attach_avatar_to(users(:david))
+
+    get rails_storage_proxy_path(blob.representation(resize_to_fill: [ 256, 256 ]))
+    assert_response :success
+    assert_includes response.headers["Cache-Control"], "public"
+  end
+
   # Account exports
 
   test "export owner can download their export" do