diff --git a/common/src/main/java/com/google/i18n/addressinput/common/CacheData.java b/common/src/main/java/com/google/i18n/addressinput/common/CacheData.java
index 24f5c83..d8c2155 100644
--- a/common/src/main/java/com/google/i18n/addressinput/common/CacheData.java
+++ b/common/src/main/java/com/google/i18n/addressinput/common/CacheData.java
@@ -338,7 +338,11 @@ void getFromRegionDataConstants(final LookupKey key) {
         key.getValueForUpperLevelField(AddressField.COUNTRY));
     if (data != null) {
       try {
-        cache.putObj(key.toString(), JsoMap.buildJsoMap(data));
+        JsoMap obj = JsoMap.buildJsoMap(data);
+        String id = Util.toLowerCaseLocaleIndependent(AddressDataKey.ID.toString());
+        String keyString = key.toString();
+        obj.put(id, keyString);
+        cache.putObj(keyString, obj);
       } catch (JSONException e) {
         logger.warning("Failed to parse data for key " + key + " from RegionDataConstants");
       }