diff --git a/app/models/attribute_help_text.rb b/app/models/attribute_help_text.rb
index fb0f2f30aa2..f9797bfa4d3 100644
--- a/app/models/attribute_help_text.rb
+++ b/app/models/attribute_help_text.rb
@@ -30,7 +30,9 @@ class AttributeHelpText < ApplicationRecord
   acts_as_attachable viewable_by_all_users: true
 
   def self.cached(user)
-    OpenProject::Cache.fetch([name, user]) { visible(user).select(:id, :attribute_name).index_by(&:attribute_name) }
+    RequestStore.fetch(name) do
+      visible(user).select(:id, :attribute_name).index_by(&:attribute_name)
+    end
   end
 
   def self.for(model)