diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5eaf11a..16dff2c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         alchemy_branch:
-          - 8.1-stable
+          - main
         ruby:
           - "3.2"
           - "3.3"
diff --git a/Gemfile b/Gemfile
index 2b0ee91..c8bcb7b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,9 +17,9 @@ gemspec
 # gem 'byebug', group: [:development, :test]
 gem "sqlite3", "~> 2.2"
 
-alchemy_branch = ENV.fetch("ALCHEMY_BRANCH", "8.1-stable")
+alchemy_branch = ENV.fetch("ALCHEMY_BRANCH", "main")
 gem "alchemy_cms", github: "AlchemyCMS/alchemy_cms", branch: alchemy_branch
-gem "alchemy-devise", github: "AlchemyCMS/alchemy-devise", branch: "main"
+gem "alchemy-devise", github: "AlchemyCMS/alchemy-devise", branch: alchemy_branch
 
 gem "rubocop", require: false
 gem "standard", "~> 1.25", require: false
diff --git a/alchemy-json_api.gemspec b/alchemy-json_api.gemspec
index 1cfb874..dd98a8c 100644
--- a/alchemy-json_api.gemspec
+++ b/alchemy-json_api.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
 
   spec.files = Dir["{app,config,db,lib}/**/*", "LICENSE", "Rakefile", "README.md"]
 
-  spec.add_dependency "alchemy_cms", [">= 8.1.0.a", "< 9"]
+  spec.add_dependency "alchemy_cms", [">= 8.2.0.a", "< 9"]
   spec.add_dependency "jsonapi.rb", [">= 1.6.0", "< 2.2"]
 
   spec.add_development_dependency "factory_bot"
diff --git a/app/controllers/alchemy/json_api/pages_controller.rb b/app/controllers/alchemy/json_api/pages_controller.rb
index 1758214..9ee20b5 100644
--- a/app/controllers/alchemy/json_api/pages_controller.rb
+++ b/app/controllers/alchemy/json_api/pages_controller.rb
@@ -125,7 +125,7 @@ def etag(pages)
       end
 
       def page_cache_key(page)
-        page.cache_key_with_version
+        Alchemy::Page::EtagGenerator.new(page).call
       end
 
       def base_page_scope
diff --git a/spec/serializers/alchemy/json_api/element_serializer_spec.rb b/spec/serializers/alchemy/json_api/element_serializer_spec.rb
index f72268b..79462c5 100644
--- a/spec/serializers/alchemy/json_api/element_serializer_spec.rb
+++ b/spec/serializers/alchemy/json_api/element_serializer_spec.rb
@@ -8,11 +8,10 @@
       :alchemy_element,
       autogenerate_ingredients: true,
       tag_list: "Tag1,Tag2",
-      nested_elements: [nested_element],
       parent_element: parent_element
     )
   end
-  let(:nested_element) { FactoryBot.create(:alchemy_element) }
+  let!(:nested_element) { FactoryBot.create(:alchemy_element, parent_element: element) }
   let(:parent_element) { FactoryBot.create(:alchemy_element) }
   let(:options) { {} }