diff --git a/activerecord-session_store.gemspec b/activerecord-session_store.gemspec
index efe846d..d186c77 100644
--- a/activerecord-session_store.gemspec
+++ b/activerecord-session_store.gemspec
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency('railties', '>= 6.1')
   s.add_dependency('rack', '>= 2.0.8', '< 3')
   s.add_dependency('multi_json', '~> 1.11', '>= 1.11.2')
+  s.add_dependency('cgi', '>= 0.3.6')
 
   s.add_development_dependency('sqlite3')
 end
diff --git a/gemfiles/rails_edge.gemfile b/gemfiles/rails_edge.gemfile
index b78671f..26eb457 100644
--- a/gemfiles/rails_edge.gemfile
+++ b/gemfiles/rails_edge.gemfile
@@ -6,7 +6,6 @@ git "https://github.com/rails/rails.git", :branch => "main" do
   gem "railties"
 end
 
-gem "rack", :git => "https://github.com/rack/rack.git", :branch => "main"
-gem "rack-session", :git => "https://github.com/rack/rack-session.git", :branch => "main"
+gem "rack", "~> 2.0", ">= 2.2.4"
 
 gemspec :path => "../"
diff --git a/test/action_controller_test.rb b/test/action_controller_test.rb
index 06badbd..306bd40 100644
--- a/test/action_controller_test.rb
+++ b/test/action_controller_test.rb
@@ -127,7 +127,7 @@ def test_getting_session_value_after_session_reset
       get '/set_session_value'
       assert_response :success
       assert cookies['_session_id']
-      session_cookie = cookies.send(:hash_for)['_session_id']
+      session_cookie = cookies.get_cookie('_session_id')
 
       get '/call_reset_session'
       assert_response :success