diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/Country.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/Country.kt
index 25c5d3f8ff24dc7536fa7efb0ff6208e59b50f1d..4c07b081e2ebfa4f2c584404c3642cbdc141e5e5 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/Country.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/Country.kt
@@ -1,9 +1,9 @@
 package de.rki.coronawarnapp.ui
 
+import android.content.Context
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import de.rki.coronawarnapp.R
-import de.rki.coronawarnapp.util.ui.CachedString
 
 enum class Country(
     val code: String,
@@ -43,5 +43,7 @@ enum class Country(
     SI("si", R.string.country_name_si, R.drawable.ic_country_si),
     SK("sk", R.string.country_name_sk, R.drawable.ic_country_sk);
 
-    val label = CachedString { it.getString(labelRes) }
+    fun getLabel(context: Context): String {
+        return context.getString(labelRes)
+    }
 }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/view/CountryListView.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/view/CountryListView.kt
index ed93584ddf85f339b74c0cf3afdff10c77225200..8a5a0c171e4ccf0e32a7ec85370a9c54a440712d 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/view/CountryListView.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/view/CountryListView.kt
@@ -25,10 +25,10 @@ class CountryListView(context: Context, attrs: AttributeSet) : LinearLayout(cont
         set(value) {
             field = value.sortedWith { a, b ->
                 // Sort country list alphabetically
-                Collator.getInstance().compare(a.label.get(context), b.label.get(context))
+                Collator.getInstance().compare(a.getLabel(context), b.getLabel(context))
             }.also { countries ->
                 adapterCountryFlags.countryList = countries
-                countryNames.text = countries.joinToString(", ") { it.label.get(context) }
+                countryNames.text = countries.joinToString(", ") { it.getLabel(context) }
             }
         }