diff --git a/components/l10n/manager.cpp b/components/l10n/manager.cpp
index b176e4aa7a..1f75c5b073 100644
--- a/components/l10n/manager.cpp
+++ b/components/l10n/manager.cpp
@@ -31,7 +31,7 @@ namespace L10n
                 msg << " " << l.getName();
         }
         for (auto& [key, context] : mCache)
-            updateContext(key.first, *context);
+            updateContext(std::get<0>(key), *context);
     }
 
     void Manager::readLangData(std::string_view name, MessageBundles& ctx, const icu::Locale& lang)
@@ -91,7 +91,7 @@ namespace L10n
     std::shared_ptr<const MessageBundles> Manager::getContext(
         std::string_view contextName, const std::string& fallbackLocaleName)
     {
-        std::pair<std::string_view, std::string_view> key(contextName, fallbackLocaleName);
+        std::tuple<std::string_view, std::string_view> key(contextName, fallbackLocaleName);
         auto it = mCache.find(key);
         if (it != mCache.end())
             return it->second;
diff --git a/components/l10n/manager.hpp b/components/l10n/manager.hpp
index 7022057178..89a9bd4b05 100644
--- a/components/l10n/manager.hpp
+++ b/components/l10n/manager.hpp
@@ -40,7 +40,7 @@ namespace L10n
 
         const VFS::Manager* mVFS;
         std::vector<icu::Locale> mPreferredLocales;
-        std::map<std::pair<std::string, std::string>, std::shared_ptr<MessageBundles>, std::less<>> mCache;
+        std::map<std::tuple<std::string, std::string>, std::shared_ptr<MessageBundles>, std::less<>> mCache;
         std::function<std::string(std::string_view)> mGmstLoader;
     };