app/controllers/alchemy/pages_controller.rb

@@ -223,8 +223,7 @@ def signup_required?
     # Otherwise all users will see the same cached page, regardless of user's state.
     #
     def page_etag
-      @page.cache_key_with_version +
-        current_alchemy_user.try(:cache_key_with_version).to_s
+      [@page, current_alchemy_user]
     end
 
     # We only render the page if either the cache is disabled for this page

spec/controllers/alchemy/pages_controller_spec.rb

@@ -273,12 +273,11 @@ module Alchemy
         subject { controller.send(:page_etag) }
 
         before do
-          expect(page).to receive(:cache_key_with_version).and_return("aaa")
           controller.instance_variable_set("@page", page)
         end
 
         it "returns the etag for response headers" do
-          expect(subject).to eq("aaa")
+          expect(subject).to include(page)
         end
 
         context "with user logged in" do
@@ -287,7 +286,7 @@ module Alchemy
           end
 
           it "returns another etag for response headers" do
-            expect(subject).to eq("aaabbb")
+            expect(subject).to include(an_instance_of(Alchemy.user_class))
           end
         end
       end