diff --git a/app/lib/entity_cache.rb b/app/lib/entity_cache.rb
index 80b0046eea..5f2e578e98 100644
--- a/app/lib/entity_cache.rb
+++ b/app/lib/entity_cache.rb
@@ -19,22 +19,28 @@ class EntityCache
     shortcodes = Array(shortcodes)
     return [] if shortcodes.empty?
 
-    cached       = Rails.cache.read_multi(*shortcodes.map { |shortcode| to_key(:emoji, shortcode, domain) })
+    domain = domain.downcase if domain
+
+    cached       = Rails.cache.read_multi(*shortcodes.map { |shortcode| to_emoji(:emoji, shortcode, domain) })
     uncached_ids = []
 
     shortcodes.each do |shortcode|
-      uncached_ids << shortcode unless cached.key?(to_key(:emoji, shortcode, domain))
+      uncached_ids << shortcode unless cached.key?(to_emoji(:emoji, shortcode, domain))
     end
 
     unless uncached_ids.empty?
       uncached = CustomEmoji.where(shortcode: shortcodes, domain: domain, disabled: false).index_by(&:shortcode)
-      uncached.each_value { |item| Rails.cache.write(to_key(:emoji, item.shortcode, domain), item, expires_in: MAX_EXPIRATION) }
+      uncached.each_value { |item| Rails.cache.write(to_emoji(:emoji, item.shortcode, domain), item, expires_in: MAX_EXPIRATION) }
     end
 
-    shortcodes.filter_map { |shortcode| cached[to_key(:emoji, shortcode, domain)] || uncached[shortcode] }
+    shortcodes.filter_map { |shortcode| cached[to_emoji(:emoji, shortcode, domain)] || uncached[shortcode] }
   end
 
   def to_key(type, *ids)
     "#{type}:#{ids.compact.map(&:downcase).join(':')}"
   end
+
+  def to_emoji(type, *ids)
+    "#{type}:#{ids.compact.join(':')}"
+  end
 end