diff --git a/Askmethat.Aspnet.JsonLocalizer/Askmethat.Aspnet.JsonLocalizer.csproj b/Askmethat.Aspnet.JsonLocalizer/Askmethat.Aspnet.JsonLocalizer.csproj
index d1f40b3..4ea8d17 100644
--- a/Askmethat.Aspnet.JsonLocalizer/Askmethat.Aspnet.JsonLocalizer.csproj
+++ b/Askmethat.Aspnet.JsonLocalizer/Askmethat.Aspnet.JsonLocalizer.csproj
@@ -13,7 +13,7 @@
     <Copyright>Copyright 2018 (c) Askmethat Corporation.</Copyright>
     <PackageTags>Json Localizer Globalization netcore netstandard</PackageTags>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>1.1.6</Version>
+    <Version>2.1.0</Version>
     <RepositoryUrl>https://github.com/AlexTeixeira/Askmethat-Aspnet-JsonLocalizer</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
   </PropertyGroup>
diff --git a/Askmethat.Aspnet.JsonLocalizer/Extensions/JsonLocalizationOptions.cs b/Askmethat.Aspnet.JsonLocalizer/Extensions/JsonLocalizationOptions.cs
index 688da14..2899681 100644
--- a/Askmethat.Aspnet.JsonLocalizer/Extensions/JsonLocalizationOptions.cs
+++ b/Askmethat.Aspnet.JsonLocalizer/Extensions/JsonLocalizationOptions.cs
@@ -10,10 +10,6 @@ namespace Askmethat.Aspnet.JsonLocalizer.Extensions
 {
     public class JsonLocalizationOptions : LocalizationOptions
     {
-        public JsonLocalizationOptions()
-        {
-            SupportedCultureInfos = new HashSet<CultureInfo>();
-        }
 
         const char PLURAL_SEPARATOR = '|';
         const string DEFAULT_RESOURCES = "Resources";
@@ -33,12 +29,11 @@ public CultureInfo DefaultCulture
             {
                 return defaultCulture;
             }
-            set
+            set                 
             {
                 if (value != defaultCulture)
                 {
                     defaultCulture = value ?? CultureInfo.InvariantCulture;
-                    AddDefaultCulture();
                 }
             }
         }
@@ -59,7 +54,6 @@ public HashSet<CultureInfo> SupportedCultureInfos
                 if (value != supportedCultureInfos)
                 {
                     supportedCultureInfos = value;
-                    AddDefaultCulture();
                 }
             }
         }
@@ -71,13 +65,5 @@ public HashSet<CultureInfo> SupportedCultureInfos
 
         public bool UseBaseName { get; set; } = false;
         public char PluralSeparator { get; set; } = PLURAL_SEPARATOR;
-
-        void AddDefaultCulture()
-        {
-            if (!SupportedCultureInfos.Contains(defaultCulture) && defaultCulture != null)
-            {
-                SupportedCultureInfos.Add(defaultCulture);
-            }
-        }
     }
 }
diff --git a/Askmethat.Aspnet.JsonLocalizer/Localizer/JsonStringLocalizer.cs b/Askmethat.Aspnet.JsonLocalizer/Localizer/JsonStringLocalizer.cs
index 9b0cae5..0d8c467 100644
--- a/Askmethat.Aspnet.JsonLocalizer/Localizer/JsonStringLocalizer.cs
+++ b/Askmethat.Aspnet.JsonLocalizer/Localizer/JsonStringLocalizer.cs
@@ -22,15 +22,11 @@ public JsonStringLocalizer(IOptions<JsonLocalizationOptions> localizationOptions
             _env = env;
             _resourcesRelativePath = GetJsonRelativePath(_localizationOptions.Value.ResourcesPath);
 
-            foreach (var ci in localizationOptions.Value.SupportedCultureInfos)
-            {
-                InitJsonStringLocalizer(ci);
-            }
-
-            //after initialization, get current ui culture
-            GetCultureToUse(CultureInfo.CurrentUICulture);
+            InitJsonStringLocalizer();
         }
 
+
+
         public LocalizedString this[string name]
         {
             get
@@ -111,8 +107,11 @@ string GetString(string name, bool shouldTryDefaultCulture = true)
             }
 
             LocalizatedFormat localizedValue = null;
-            if (currentUsedCulture == _localizationOptions.Value.DefaultCulture || currentUsedCulture != CultureInfo.CurrentUICulture)
+
+            if (!shouldTryDefaultCulture && !IsUICultureCurrentCulture(CultureInfo.CurrentUICulture))
             {
+                InitJsonStringLocalizer(CultureInfo.CurrentUICulture);
+                AddMissingCultureToSupportedCulture(CultureInfo.CurrentUICulture);
                 GetCultureToUse(CultureInfo.CurrentUICulture);
             }
 
diff --git a/Askmethat.Aspnet.JsonLocalizer/Localizer/JsonStringLocalizerBase.cs b/Askmethat.Aspnet.JsonLocalizer/Localizer/JsonStringLocalizerBase.cs
index c368483..10a9476 100644
--- a/Askmethat.Aspnet.JsonLocalizer/Localizer/JsonStringLocalizerBase.cs
+++ b/Askmethat.Aspnet.JsonLocalizer/Localizer/JsonStringLocalizerBase.cs
@@ -1,14 +1,13 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
 using Askmethat.Aspnet.JsonLocalizer.Extensions;
 using Askmethat.Aspnet.JsonLocalizer.Format;
-using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
 
 namespace Askmethat.Aspnet.JsonLocalizer.Localizer
 {
@@ -22,7 +21,7 @@ internal class JsonStringLocalizerBase
 
         protected readonly TimeSpan _memCacheDuration;
         protected const string CACHE_KEY = "LocalizationBlob";
-        protected CultureInfo currentUsedCulture;
+        protected const string CURRENT_USED_CULTURE = "CurrentUsedCulture";
 
         public JsonStringLocalizerBase(IOptions<JsonLocalizationOptions> localizationOptions, string baseName = null)
         {
@@ -34,6 +33,13 @@ public JsonStringLocalizerBase(IOptions<JsonLocalizationOptions> localizationOpt
         }
 
         string GetCacheKey(CultureInfo ci) => $"{CACHE_KEY}_{ci.DisplayName}";
+        void SetCurrentCultureToCache(CultureInfo ci) => _memCache.Set(CURRENT_USED_CULTURE, ci.Name);
+        protected bool IsUICultureCurrentCulture(CultureInfo ci) {
+            string currentCulture = string.Empty;
+            _memCache.TryGetValue(CURRENT_USED_CULTURE, out currentCulture);
+
+            return string.Equals(currentCulture, ci.Name, StringComparison.InvariantCultureIgnoreCase);
+        }
 
         protected void GetCultureToUse(CultureInfo cultureToUse)
         {
@@ -41,15 +47,37 @@ protected void GetCultureToUse(CultureInfo cultureToUse)
             {
                 if (_memCache.TryGetValue(GetCacheKey(cultureToUse.Parent), out localization))
                 {
-                    currentUsedCulture = cultureToUse.Parent;
+                    SetCurrentCultureToCache(cultureToUse.Parent);
                 }
                 else
                 {
                     _memCache.TryGetValue(GetCacheKey(cultureToUse), out localization);
-                    currentUsedCulture = _localizationOptions.Value.DefaultCulture;
+                    SetCurrentCultureToCache(_localizationOptions.Value.DefaultCulture);
                 }
             }
-            currentUsedCulture = cultureToUse;
+            SetCurrentCultureToCache(cultureToUse);
+        }
+
+        protected void InitJsonStringLocalizer()
+        {
+            AddMissingCultureToSupportedCulture(CultureInfo.CurrentUICulture);
+            AddMissingCultureToSupportedCulture(_localizationOptions.Value.DefaultCulture);
+
+            foreach (CultureInfo ci in _localizationOptions.Value.SupportedCultureInfos)
+            {
+                InitJsonStringLocalizer(ci);
+            }
+
+            //after initialization, get current ui culture
+            GetCultureToUse(CultureInfo.CurrentUICulture);
+        }
+
+        protected void AddMissingCultureToSupportedCulture(CultureInfo cultureInfo)
+        {
+            if (!_localizationOptions.Value.SupportedCultureInfos.Contains(cultureInfo))
+            {
+                _localizationOptions.Value.SupportedCultureInfos.Add(cultureInfo);
+            }
         }
 
         protected void InitJsonStringLocalizer(CultureInfo currentCulture)
diff --git a/benchmark/Askmethat.Aspnet.JsonLocalizer.Benchmark/Askmethat.Aspnet.JsonLocalizer.Benchmark.csproj b/benchmark/Askmethat.Aspnet.JsonLocalizer.Benchmark/Askmethat.Aspnet.JsonLocalizer.Benchmark.csproj
index 50e3afe..8a9506a 100644
--- a/benchmark/Askmethat.Aspnet.JsonLocalizer.Benchmark/Askmethat.Aspnet.JsonLocalizer.Benchmark.csproj
+++ b/benchmark/Askmethat.Aspnet.JsonLocalizer.Benchmark/Askmethat.Aspnet.JsonLocalizer.Benchmark.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.11.3" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.11.5" />
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.2.0" />
   </ItemGroup>
   <ItemGroup>
diff --git a/benchmark/Askmethat.Aspnet.JsonLocalizer.Benchmark/BenchmarkDotNet.Artifacts/results/Askmethat.Aspnet.JsonLocalizer.Benchmark.BenchmarkJSONLocalizer-report-default.md b/benchmark/Askmethat.Aspnet.JsonLocalizer.Benchmark/BenchmarkDotNet.Artifacts/results/Askmethat.Aspnet.JsonLocalizer.Benchmark.BenchmarkJSONLocalizer-report-default.md
index 88068d2..d3fe290 100644
--- a/benchmark/Askmethat.Aspnet.JsonLocalizer.Benchmark/BenchmarkDotNet.Artifacts/results/Askmethat.Aspnet.JsonLocalizer.Benchmark.BenchmarkJSONLocalizer-report-default.md
+++ b/benchmark/Askmethat.Aspnet.JsonLocalizer.Benchmark/BenchmarkDotNet.Artifacts/results/Askmethat.Aspnet.JsonLocalizer.Benchmark.BenchmarkJSONLocalizer-report-default.md
@@ -1,14 +1,17 @@
 
-BenchmarkDotNet=v0.11.3, OS=macOS Mojave 10.14.4 (18E226) [Darwin 18.5.0]
-Intel Core i7-5557U CPU 3.10GHz (Broadwell), 1 CPU, 4 logical and 2 physical cores
-.NET Core SDK=2.2.106
-  [Host]     : .NET Core 2.2.4 (CoreCLR 4.6.27521.02, CoreFX 4.6.27521.01), 64bit RyuJIT
-  DefaultJob : .NET Core 2.2.4 (CoreCLR 4.6.27521.02, CoreFX 4.6.27521.01), 64bit RyuJIT
+BenchmarkDotNet=v0.11.5, OS=Windows 10.0.17134.706 (1803/April2018Update/Redstone4)
+Intel Core i7-6700 CPU 3.40GHz (Skylake), 1 CPU, 8 logical and 4 physical cores
+Frequency=3328125 Hz, Resolution=300.4695 ns, Timer=TSC
+.NET Core SDK=2.2.103
+  [Host]     : .NET Core 2.2.1 (CoreCLR 4.6.27207.03, CoreFX 4.6.27207.03), 64bit RyuJIT
+  DefaultJob : .NET Core 2.2.1 (CoreCLR 4.6.27207.03, CoreFX 4.6.27207.03), 64bit RyuJIT
 
 
-                                          Method |          Mean |         Error |        StdDev |           Min |           Max |    Ratio | RatioSD | Gen 0/1k Op | Gen 1/1k Op | Gen 2/1k Op | Allocated Memory/Op |
------------------------------------------------- |--------------:|--------------:|--------------:|--------------:|--------------:|---------:|--------:|------------:|------------:|------------:|--------------------:|
-                                   JsonLocalizer |      68.83 ns |     0.1259 ns |     0.1116 ns |      68.58 ns |      68.95 ns |     0.63 |    0.00 |      0.0228 |           - |           - |                48 B |
-                       JsonLocalizerWithCreation | 512,929.54 ns | 1,795.6669 ns | 1,679.6679 ns | 510,100.03 ns | 515,499.84 ns | 4,678.08 |   13.62 |     83.0078 |     29.2969 |      4.8828 |            174968 B |
- JsonLocalizerWithCreationAndExternalMemoryCache |   4,930.42 ns |    20.7277 ns |    18.3746 ns |   4,888.34 ns |   4,956.98 ns |    44.98 |    0.18 |      1.7624 |      0.8774 |           - |              3712 B |
-                                       Localizer |     109.62 ns |     0.1763 ns |     0.1563 ns |     109.48 ns |     110.05 ns |     1.00 |    0.00 |           - |           - |           - |                   - |
+                                          Method |          Mean |         Error |        StdDev |           Min |           Max |     Ratio |  RatioSD |   Gen 0 |   Gen 1 |  Gen 2 | Allocated |
+------------------------------------------------ |--------------:|--------------:|--------------:|--------------:|--------------:|----------:|---------:|--------:|--------:|-------:|----------:|
+                                   JsonLocalizer |      55.49 ns |      1.176 ns |      2.454 ns |      52.55 ns |      61.80 ns |      1.00 |     0.00 |  0.0114 |       - |      - |      48 B |
+                                       Localizer |      98.09 ns |      1.176 ns |      1.042 ns |      96.39 ns |     100.23 ns |      1.78 |     0.06 |       - |       - |      - |         - |
+                       JsonLocalizerWithCreation | 647,389.65 ns | 19,441.235 ns | 56,402.548 ns | 573,985.62 ns | 814,434.86 ns | 11,620.42 | 1,268.33 | 41.0156 | 20.5078 | 1.9531 |  174688 B |
+ JsonLocalizerWithCreationAndExternalMemoryCache |   5,120.16 ns |     99.768 ns |    152.356 ns |   4,962.78 ns |   5,522.11 ns |     91.02 |     5.12 |  0.9384 |  0.4654 |      - |    3944 B |
+                            JsonLocalizerDefault |     268.60 ns |      1.787 ns |      1.492 ns |     266.84 ns |     271.32 ns |      4.88 |     0.15 |  0.0892 |       - |      - |     376 B |
+                                LocalizerDefault |     316.64 ns |      4.932 ns |      4.614 ns |     311.53 ns |     326.27 ns |      5.73 |     0.19 |  0.0777 |       - |      - |     328 B |
diff --git a/benchmark/Askmethat.Aspnet.JsonLocalizer.Benchmark/BenchmarkDotNet.Artifacts/results/Askmethat.Aspnet.JsonLocalizer.Benchmark.BenchmarkJSONLocalizer-report-github.md b/benchmark/Askmethat.Aspnet.JsonLocalizer.Benchmark/BenchmarkDotNet.Artifacts/results/Askmethat.Aspnet.JsonLocalizer.Benchmark.BenchmarkJSONLocalizer-report-github.md
index 23d03d1..7769fbc 100644
--- a/benchmark/Askmethat.Aspnet.JsonLocalizer.Benchmark/BenchmarkDotNet.Artifacts/results/Askmethat.Aspnet.JsonLocalizer.Benchmark.BenchmarkJSONLocalizer-report-github.md
+++ b/benchmark/Askmethat.Aspnet.JsonLocalizer.Benchmark/BenchmarkDotNet.Artifacts/results/Askmethat.Aspnet.JsonLocalizer.Benchmark.BenchmarkJSONLocalizer-report-github.md
@@ -1,16 +1,19 @@
 ``` ini
 
-BenchmarkDotNet=v0.11.3, OS=macOS Mojave 10.14.4 (18E226) [Darwin 18.5.0]
-Intel Core i7-5557U CPU 3.10GHz (Broadwell), 1 CPU, 4 logical and 2 physical cores
-.NET Core SDK=2.2.106
-  [Host]     : .NET Core 2.2.4 (CoreCLR 4.6.27521.02, CoreFX 4.6.27521.01), 64bit RyuJIT
-  DefaultJob : .NET Core 2.2.4 (CoreCLR 4.6.27521.02, CoreFX 4.6.27521.01), 64bit RyuJIT
+BenchmarkDotNet=v0.11.5, OS=Windows 10.0.17134.706 (1803/April2018Update/Redstone4)
+Intel Core i7-6700 CPU 3.40GHz (Skylake), 1 CPU, 8 logical and 4 physical cores
+Frequency=3328125 Hz, Resolution=300.4695 ns, Timer=TSC
+.NET Core SDK=2.2.103
+  [Host]     : .NET Core 2.2.1 (CoreCLR 4.6.27207.03, CoreFX 4.6.27207.03), 64bit RyuJIT
+  DefaultJob : .NET Core 2.2.1 (CoreCLR 4.6.27207.03, CoreFX 4.6.27207.03), 64bit RyuJIT
 
 
 ```
-|                                          Method |          Mean |         Error |        StdDev |           Min |           Max |    Ratio | RatioSD | Gen 0/1k Op | Gen 1/1k Op | Gen 2/1k Op | Allocated Memory/Op |
-|------------------------------------------------ |--------------:|--------------:|--------------:|--------------:|--------------:|---------:|--------:|------------:|------------:|------------:|--------------------:|
-|                                   JsonLocalizer |      68.83 ns |     0.1259 ns |     0.1116 ns |      68.58 ns |      68.95 ns |     0.63 |    0.00 |      0.0228 |           - |           - |                48 B |
-|                       JsonLocalizerWithCreation | 512,929.54 ns | 1,795.6669 ns | 1,679.6679 ns | 510,100.03 ns | 515,499.84 ns | 4,678.08 |   13.62 |     83.0078 |     29.2969 |      4.8828 |            174968 B |
-| JsonLocalizerWithCreationAndExternalMemoryCache |   4,930.42 ns |    20.7277 ns |    18.3746 ns |   4,888.34 ns |   4,956.98 ns |    44.98 |    0.18 |      1.7624 |      0.8774 |           - |              3712 B |
-|                                       Localizer |     109.62 ns |     0.1763 ns |     0.1563 ns |     109.48 ns |     110.05 ns |     1.00 |    0.00 |           - |           - |           - |                   - |
+|                                          Method |          Mean |         Error |        StdDev |           Min |           Max |     Ratio |  RatioSD |   Gen 0 |   Gen 1 |  Gen 2 | Allocated |
+|------------------------------------------------ |--------------:|--------------:|--------------:|--------------:|--------------:|----------:|---------:|--------:|--------:|-------:|----------:|
+|                                   JsonLocalizer |      55.49 ns |      1.176 ns |      2.454 ns |      52.55 ns |      61.80 ns |      1.00 |     0.00 |  0.0114 |       - |      - |      48 B |
+|                                       Localizer |      98.09 ns |      1.176 ns |      1.042 ns |      96.39 ns |     100.23 ns |      1.78 |     0.06 |       - |       - |      - |         - |
+|                       JsonLocalizerWithCreation | 647,389.65 ns | 19,441.235 ns | 56,402.548 ns | 573,985.62 ns | 814,434.86 ns | 11,620.42 | 1,268.33 | 41.0156 | 20.5078 | 1.9531 |  174688 B |
+| JsonLocalizerWithCreationAndExternalMemoryCache |   5,120.16 ns |     99.768 ns |    152.356 ns |   4,962.78 ns |   5,522.11 ns |     91.02 |     5.12 |  0.9384 |  0.4654 |      - |    3944 B |
+|                            JsonLocalizerDefault |     268.60 ns |      1.787 ns |      1.492 ns |     266.84 ns |     271.32 ns |      4.88 |     0.15 |  0.0892 |       - |      - |     376 B |
+|                                LocalizerDefault |     316.64 ns |      4.932 ns |      4.614 ns |     311.53 ns |     326.27 ns |      5.73 |     0.19 |  0.0777 |       - |      - |     328 B |
diff --git a/benchmark/Askmethat.Aspnet.JsonLocalizer.Benchmark/BenchmarkDotNet.Artifacts/results/Askmethat.Aspnet.JsonLocalizer.Benchmark.BenchmarkJSONLocalizer-report.csv b/benchmark/Askmethat.Aspnet.JsonLocalizer.Benchmark/BenchmarkDotNet.Artifacts/results/Askmethat.Aspnet.JsonLocalizer.Benchmark.BenchmarkJSONLocalizer-report.csv
index a9b1a28..a040770 100644
--- a/benchmark/Askmethat.Aspnet.JsonLocalizer.Benchmark/BenchmarkDotNet.Artifacts/results/Askmethat.Aspnet.JsonLocalizer.Benchmark.BenchmarkJSONLocalizer-report.csv
+++ b/benchmark/Askmethat.Aspnet.JsonLocalizer.Benchmark/BenchmarkDotNet.Artifacts/results/Askmethat.Aspnet.JsonLocalizer.Benchmark.BenchmarkJSONLocalizer-report.csv
@@ -1,5 +1,7 @@
-Method Job AnalyzeLaunchVariance EvaluateOverhead MaxAbsoluteError MaxRelativeError MinInvokeCount MinIterationTime OutlierMode Affinity EnvironmentVariables Jit Platform Runtime AllowVeryLargeObjects Concurrent CpuGroups Force HeapAffinitizeMask HeapCount NoAffinitize RetainVm Server Arguments BuildConfiguration Clock EngineFactory NuGetReferences Toolchain IsMutator InvocationCount IterationCount IterationTime LaunchCount MaxIterationCount MaxWarmupIterationCount MinIterationCount MinWarmupIterationCount RunStrategy UnrollFactor WarmupCount Mean Error StdDev Min Max Ratio RatioSD Gen 0/1k Op Gen 1/1k Op Gen 2/1k Op Allocated Memory/Op
-JsonLocalizer Default False Default Default Default Default Default Default 0000 Empty RyuJit X64 Core False True False True Default Default False False False Default Default Default Default Default Default Default 1 Default Default Default Default Default Default Default Default 16 Default 68.83 ns 0.1259 ns 0.1116 ns 68.58 ns 68.95 ns 0.63 0.00 0.0228 - - 48 B
-JsonLocalizerWithCreation Default False Default Default Default Default Default Default 0000 Empty RyuJit X64 Core False True False True Default Default False False False Default Default Default Default Default Default Default 1 Default Default Default Default Default Default Default Default 16 Default "512,929.54 ns" "1,795.6669 ns" "1,679.6679 ns" "510,100.03 ns" "515,499.84 ns" "4,678.08" 13.62 83.0078 29.2969 4.8828 174968 B
-JsonLocalizerWithCreationAndExternalMemoryCache Default False Default Default Default Default Default Default 0000 Empty RyuJit X64 Core False True False True Default Default False False False Default Default Default Default Default Default Default 1 Default Default Default Default Default Default Default Default 16 Default "4,930.42 ns" 20.7277 ns 18.3746 ns "4,888.34 ns" "4,956.98 ns" 44.98 0.18 1.7624 0.8774 - 3712 B
-Localizer Default False Default Default Default Default Default Default 0000 Empty RyuJit X64 Core False True False True Default Default False False False Default Default Default Default Default Default Default 1 Default Default Default Default Default Default Default Default 16 Default 109.62 ns 0.1763 ns 0.1563 ns 109.48 ns 110.05 ns 1.00 0.00 - - - -
+Method;Job;AnalyzeLaunchVariance;EvaluateOverhead;MaxAbsoluteError;MaxRelativeError;MinInvokeCount;MinIterationTime;OutlierMode;Affinity;EnvironmentVariables;Jit;Platform;Runtime;AllowVeryLargeObjects;Concurrent;CpuGroups;Force;HeapAffinitizeMask;HeapCount;NoAffinitize;RetainVm;Server;PowerPlan;Arguments;BuildConfiguration;Clock;EngineFactory;NuGetReferences;Toolchain;IsMutator;InvocationCount;IterationCount;IterationTime;LaunchCount;MaxIterationCount;MaxWarmupIterationCount;MinIterationCount;MinWarmupIterationCount;RunStrategy;UnrollFactor;WarmupCount;Mean;Error;StdDev;Min;Max;Ratio;RatioSD;Gen 0;Gen 1;Gen 2;Allocated
+JsonLocalizer;Default;False;Default;Default;Default;Default;Default;Default;11111111;Empty;RyuJit;X64;Core;False;True;False;True;Default;Default;False;False;False;Default;Default;Default;Default;Default;Default;Default;Default;1;Default;Default;Default;Default;Default;Default;Default;Default;16;Default;55.49 ns;1.176 ns;2.454 ns;52.55 ns;61.80 ns;1.00;0.00;0.0114;-;-;48 B
+Localizer;Default;False;Default;Default;Default;Default;Default;Default;11111111;Empty;RyuJit;X64;Core;False;True;False;True;Default;Default;False;False;False;Default;Default;Default;Default;Default;Default;Default;Default;1;Default;Default;Default;Default;Default;Default;Default;Default;16;Default;98.09 ns;1.176 ns;1.042 ns;96.39 ns;100.23 ns;1.78;0.06;-;-;-;-
+JsonLocalizerWithCreation;Default;False;Default;Default;Default;Default;Default;Default;11111111;Empty;RyuJit;X64;Core;False;True;False;True;Default;Default;False;False;False;Default;Default;Default;Default;Default;Default;Default;Default;1;Default;Default;Default;Default;Default;Default;Default;Default;16;Default;"647,389.65 ns";"19,441.235 ns";"56,402.548 ns";"573,985.62 ns";"814,434.86 ns";"11,620.42";"1,268.33";41.0156;20.5078;1.9531;174688 B
+JsonLocalizerWithCreationAndExternalMemoryCache;Default;False;Default;Default;Default;Default;Default;Default;11111111;Empty;RyuJit;X64;Core;False;True;False;True;Default;Default;False;False;False;Default;Default;Default;Default;Default;Default;Default;Default;1;Default;Default;Default;Default;Default;Default;Default;Default;16;Default;"5,120.16 ns";99.768 ns;152.356 ns;"4,962.78 ns";"5,522.11 ns";91.02;5.12;0.9384;0.4654;-;3944 B
+JsonLocalizerDefault;Default;False;Default;Default;Default;Default;Default;Default;11111111;Empty;RyuJit;X64;Core;False;True;False;True;Default;Default;False;False;False;Default;Default;Default;Default;Default;Default;Default;Default;1;Default;Default;Default;Default;Default;Default;Default;Default;16;Default;268.60 ns;1.787 ns;1.492 ns;266.84 ns;271.32 ns;4.88;0.15;0.0892;-;-;376 B
+LocalizerDefault;Default;False;Default;Default;Default;Default;Default;Default;11111111;Empty;RyuJit;X64;Core;False;True;False;True;Default;Default;False;False;False;Default;Default;Default;Default;Default;Default;Default;Default;1;Default;Default;Default;Default;Default;Default;Default;Default;16;Default;316.64 ns;4.932 ns;4.614 ns;311.53 ns;326.27 ns;5.73;0.19;0.0777;-;-;328 B
diff --git a/benchmark/Askmethat.Aspnet.JsonLocalizer.Benchmark/BenchmarkDotNet.Artifacts/results/Askmethat.Aspnet.JsonLocalizer.Benchmark.BenchmarkJSONLocalizer-report.html b/benchmark/Askmethat.Aspnet.JsonLocalizer.Benchmark/BenchmarkDotNet.Artifacts/results/Askmethat.Aspnet.JsonLocalizer.Benchmark.BenchmarkJSONLocalizer-report.html
index 41869f6..e976866 100644
--- a/benchmark/Askmethat.Aspnet.JsonLocalizer.Benchmark/BenchmarkDotNet.Artifacts/results/Askmethat.Aspnet.JsonLocalizer.Benchmark.BenchmarkJSONLocalizer-report.html
+++ b/benchmark/Askmethat.Aspnet.JsonLocalizer.Benchmark/BenchmarkDotNet.Artifacts/results/Askmethat.Aspnet.JsonLocalizer.Benchmark.BenchmarkJSONLocalizer-report.html
@@ -2,7 +2,7 @@
 <html lang='en'>
 <head>
 <meta charset='utf-8' />
-<title>Askmethat.Aspnet.JsonLocalizer.Benchmark.BenchmarkJSONLocalizer</title>
+<title>Askmethat.Aspnet.JsonLocalizer.Benchmark.BenchmarkJSONLocalizer-20190502-121607</title>
 
 <style type="text/css">
 	table { border-collapse: collapse; display: block; width: 100%; overflow: auto; }
@@ -13,21 +13,24 @@
 </head>
 <body>
 <pre><code>
-BenchmarkDotNet=v0.11.3, OS=macOS Mojave 10.14.4 (18E226) [Darwin 18.5.0]
-Intel Core i7-5557U CPU 3.10GHz (Broadwell), 1 CPU, 4 logical and 2 physical cores
-.NET Core SDK=2.2.106
-  [Host]     : .NET Core 2.2.4 (CoreCLR 4.6.27521.02, CoreFX 4.6.27521.01), 64bit RyuJIT
-  DefaultJob : .NET Core 2.2.4 (CoreCLR 4.6.27521.02, CoreFX 4.6.27521.01), 64bit RyuJIT
+BenchmarkDotNet=v0.11.5, OS=Windows 10.0.17134.706 (1803/April2018Update/Redstone4)
+Intel Core i7-6700 CPU 3.40GHz (Skylake), 1 CPU, 8 logical and 4 physical cores
+Frequency=3328125 Hz, Resolution=300.4695 ns, Timer=TSC
+.NET Core SDK=2.2.103
+  [Host]     : .NET Core 2.2.1 (CoreCLR 4.6.27207.03, CoreFX 4.6.27207.03), 64bit RyuJIT
+  DefaultJob : .NET Core 2.2.1 (CoreCLR 4.6.27207.03, CoreFX 4.6.27207.03), 64bit RyuJIT
 </code></pre>
 <pre><code></code></pre>
 
 <table>
-<thead><tr><th>                                   Method</th><th>   Mean</th><th>  Error</th><th> StdDev</th><th>    Min</th><th>    Max</th><th>Ratio</th><th>RatioSD</th><th>Gen 0/1k Op</th><th>Gen 1/1k Op</th><th>Gen 2/1k Op</th><th>Allocated Memory/Op</th>
+<thead><tr><th>                                   Method</th><th>   Mean</th><th>  Error</th><th> StdDev</th><th>    Min</th><th>    Max</th><th>Ratio</th><th>RatioSD</th><th>Gen 0</th><th>Gen 1</th><th>Gen 2</th><th>Allocated</th>
 </tr>
-</thead><tbody><tr><td>JsonLocalizer</td><td>68.83 ns</td><td>0.1259 ns</td><td>0.1116 ns</td><td>68.58 ns</td><td>68.95 ns</td><td>0.63</td><td>0.00</td><td>0.0228</td><td>-</td><td>-</td><td>48 B</td>
-</tr><tr><td>JsonLocalizerWithCreation</td><td>512,929.54 ns</td><td>1,795.6669 ns</td><td>1,679.6679 ns</td><td>510,100.03 ns</td><td>515,499.84 ns</td><td>4,678.08</td><td>13.62</td><td>83.0078</td><td>29.2969</td><td>4.8828</td><td>174968 B</td>
-</tr><tr><td>JsonLocalizerWithCreationAndExternalMemoryCache</td><td>4,930.42 ns</td><td>20.7277 ns</td><td>18.3746 ns</td><td>4,888.34 ns</td><td>4,956.98 ns</td><td>44.98</td><td>0.18</td><td>1.7624</td><td>0.8774</td><td>-</td><td>3712 B</td>
-</tr><tr><td>Localizer</td><td>109.62 ns</td><td>0.1763 ns</td><td>0.1563 ns</td><td>109.48 ns</td><td>110.05 ns</td><td>1.00</td><td>0.00</td><td>-</td><td>-</td><td>-</td><td>-</td>
+</thead><tbody><tr><td>JsonLocalizer</td><td>55.49 ns</td><td>1.176 ns</td><td>2.454 ns</td><td>52.55 ns</td><td>61.80 ns</td><td>1.00</td><td>0.00</td><td>0.0114</td><td>-</td><td>-</td><td>48 B</td>
+</tr><tr><td>Localizer</td><td>98.09 ns</td><td>1.176 ns</td><td>1.042 ns</td><td>96.39 ns</td><td>100.23 ns</td><td>1.78</td><td>0.06</td><td>-</td><td>-</td><td>-</td><td>-</td>
+</tr><tr><td>JsonLocalizerWithCreation</td><td>647,389.65 ns</td><td>19,441.235 ns</td><td>56,402.548 ns</td><td>573,985.62 ns</td><td>814,434.86 ns</td><td>11,620.42</td><td>1,268.33</td><td>41.0156</td><td>20.5078</td><td>1.9531</td><td>174688 B</td>
+</tr><tr><td>JsonLocalizerWithCreationAndExternalMemoryCache</td><td>5,120.16 ns</td><td>99.768 ns</td><td>152.356 ns</td><td>4,962.78 ns</td><td>5,522.11 ns</td><td>91.02</td><td>5.12</td><td>0.9384</td><td>0.4654</td><td>-</td><td>3944 B</td>
+</tr><tr><td>JsonLocalizerDefault</td><td>268.60 ns</td><td>1.787 ns</td><td>1.492 ns</td><td>266.84 ns</td><td>271.32 ns</td><td>4.88</td><td>0.15</td><td>0.0892</td><td>-</td><td>-</td><td>376 B</td>
+</tr><tr><td>LocalizerDefault</td><td>316.64 ns</td><td>4.932 ns</td><td>4.614 ns</td><td>311.53 ns</td><td>326.27 ns</td><td>5.73</td><td>0.19</td><td>0.0777</td><td>-</td><td>-</td><td>328 B</td>
 </tr></tbody></table>
 </body>
 </html>
diff --git a/benchmark/Askmethat.Aspnet.JsonLocalizer.Benchmark/Program.cs b/benchmark/Askmethat.Aspnet.JsonLocalizer.Benchmark/Program.cs
index bf43005..8720eca 100644
--- a/benchmark/Askmethat.Aspnet.JsonLocalizer.Benchmark/Program.cs
+++ b/benchmark/Askmethat.Aspnet.JsonLocalizer.Benchmark/Program.cs
@@ -14,6 +14,7 @@
 using Askmethat.Aspnet.JsonLocalizer.Benchmark.Resources;
 using System.Reflection;
 using Microsoft.Extensions.FileProviders;
+using System.Threading;
 
 namespace Askmethat.Aspnet.JsonLocalizer.Benchmark
 {
@@ -50,8 +51,12 @@ public BenchmarkJSONLocalizer()
             }), new HostingEnvironmentStub());
         }
 
+        [Benchmark(Baseline = true)]
+        public string JsonLocalizer() => _jsonLocalizer.GetString("BaseName1").Value;
+
+
         [Benchmark]
-        public string JsonLocalizer() => _jsonLocalizer.GetString("BaseName1");
+        public string Localizer() => SharedResources.BaseName1;
 
         [Benchmark]
         public string JsonLocalizerWithCreation()
@@ -88,9 +93,20 @@ public string JsonLocalizerWithCreationAndExternalMemoryCache()
             return localizer.GetString("BaseName1");
         }
 
+        [Benchmark]
+        public string JsonLocalizerDefaultCultureValue()
+        {
+            CultureInfo.CurrentUICulture = new CultureInfo("pt-PT");
+            return _jsonLocalizer.GetString("BaseName1").Value;
+        }
+
+        [Benchmark]
+        public string LocalizerDefaultCultureValue()
+        {
+            CultureInfo.CurrentUICulture = new CultureInfo("pt-PT");
+            return SharedResources.BaseName1;
+        }
 
-        [Benchmark(Baseline = true)]
-        public string Localizer() => SharedResources.BaseName1;
     }
 
     class Program
diff --git a/test/Askmethat.Aspnet.JsonLocalizer.Test/Askmethat.Aspnet.JsonLocalizer.Test.csproj b/test/Askmethat.Aspnet.JsonLocalizer.Test/Askmethat.Aspnet.JsonLocalizer.Test.csproj
index eb51ace..31120bc 100644
--- a/test/Askmethat.Aspnet.JsonLocalizer.Test/Askmethat.Aspnet.JsonLocalizer.Test.csproj
+++ b/test/Askmethat.Aspnet.JsonLocalizer.Test/Askmethat.Aspnet.JsonLocalizer.Test.csproj
@@ -1,34 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;netcoreapp2.1;</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.2;</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
 
-    <Version>1.1.6</Version>
+    <Version>2.1.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.2.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp1.1'">
-    <PackageReference Include="MSTest.TestAdapter" Version="1.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="1.*" />
-    <PackageReference Include="Microsoft.Composition" Version="1.0.27" ExcludeAssets="All" />
-    <PackageReference Include="System.Composition" Version="1.0.31" />
-  </ItemGroup>
-  
-
-  <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.0'">
-    <PackageReference Include="MSTest.TestAdapter" Version="1.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.0.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.1'">
-    <PackageReference Include="MSTest.TestAdapter" Version="1.3.1" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version=" 2.1.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/Askmethat.Aspnet.JsonLocalizer.Test/Localizer/AbsolutePathJsonFileTest.cs b/test/Askmethat.Aspnet.JsonLocalizer.Test/Localizer/AbsolutePathJsonFileTest.cs
index 9b6083f..f530fb4 100644
--- a/test/Askmethat.Aspnet.JsonLocalizer.Test/Localizer/AbsolutePathJsonFileTest.cs
+++ b/test/Askmethat.Aspnet.JsonLocalizer.Test/Localizer/AbsolutePathJsonFileTest.cs
@@ -1,15 +1,10 @@
-using System;
-using System.Globalization;
-using System.Text;
 using Askmethat.Aspnet.JsonLocalizer.Extensions;
 using Askmethat.Aspnet.JsonLocalizer.Localizer;
 using Askmethat.Aspnet.JsonLocalizer.Test.Helpers;
-using Askmethat.Aspnet.JsonLocalizer.TestSample;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.TestHost;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Localization;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Globalization;
 
 namespace Askmethat.Aspnet.JsonLocalizer.Test.Localizer
 {
diff --git a/test/Askmethat.Aspnet.JsonLocalizer.Test/Localizer/CustomLocalizerJsonFileTest.cs b/test/Askmethat.Aspnet.JsonLocalizer.Test/Localizer/CustomLocalizerJsonFileTest.cs
index f27cab5..a0609ef 100644
--- a/test/Askmethat.Aspnet.JsonLocalizer.Test/Localizer/CustomLocalizerJsonFileTest.cs
+++ b/test/Askmethat.Aspnet.JsonLocalizer.Test/Localizer/CustomLocalizerJsonFileTest.cs
@@ -1,13 +1,8 @@
-using System.Globalization;
 using Askmethat.Aspnet.JsonLocalizer.Extensions;
-using Askmethat.Aspnet.JsonLocalizer.Localizer;
 using Askmethat.Aspnet.JsonLocalizer.Test.Helpers;
-using Askmethat.Aspnet.JsonLocalizer.TestSample;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.TestHost;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Localization;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Globalization;
 
 namespace Askmethat.Aspnet.JsonLocalizer.Test.Localizer
 {
diff --git a/test/Askmethat.Aspnet.JsonLocalizer.Test/Localizer/EncodedJsonFileTest.cs b/test/Askmethat.Aspnet.JsonLocalizer.Test/Localizer/EncodedJsonFileTest.cs
index 6714513..3be97ea 100644
--- a/test/Askmethat.Aspnet.JsonLocalizer.Test/Localizer/EncodedJsonFileTest.cs
+++ b/test/Askmethat.Aspnet.JsonLocalizer.Test/Localizer/EncodedJsonFileTest.cs
@@ -1,13 +1,7 @@
 using Askmethat.Aspnet.JsonLocalizer.Extensions;
 using Askmethat.Aspnet.JsonLocalizer.Test.Helpers;
-using Askmethat.Aspnet.JsonLocalizer.TestSample;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.TestHost;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Localization;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.Text;
 
diff --git a/test/Askmethat.Aspnet.JsonLocalizer.Test/Localizer/FallbackJsonFileTest.cs b/test/Askmethat.Aspnet.JsonLocalizer.Test/Localizer/FallbackJsonFileTest.cs
index 5cb6f69..60d6049 100644
--- a/test/Askmethat.Aspnet.JsonLocalizer.Test/Localizer/FallbackJsonFileTest.cs
+++ b/test/Askmethat.Aspnet.JsonLocalizer.Test/Localizer/FallbackJsonFileTest.cs
@@ -1,19 +1,13 @@
-using System;
-using System.Collections;
-
-using Askmethat.Aspnet.JsonLocalizer.Extensions;
-using Askmethat.Aspnet.JsonLocalizer.TestSample;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.TestHost;
-using Microsoft.Extensions.DependencyInjection;
+using Askmethat.Aspnet.JsonLocalizer.Extensions;
+using Askmethat.Aspnet.JsonLocalizer.Localizer;
+using Askmethat.Aspnet.JsonLocalizer.Test.Helpers;
 using Microsoft.Extensions.Localization;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Collections;
 using System.Globalization;
 using System.Linq;
-
 using LocalizedString = Microsoft.Extensions.Localization.LocalizedString;
-using Askmethat.Aspnet.JsonLocalizer.Test.Helpers;
-using Askmethat.Aspnet.JsonLocalizer.Localizer;
 
 namespace Askmethat.Aspnet.JsonLocalizer.Test.Localizer
 {
@@ -50,7 +44,7 @@ public void Should_Read_Color_NoFallback()
             result = localizer.GetString("Color");
             Assert.AreEqual("Couleur (neutral)", result);
 
-            InitLocalizer(CultureInfo.InvariantCulture.DisplayName);
+            InitLocalizer(CultureInfo.InvariantCulture.ThreeLetterISOLanguageName);
             result = localizer.GetString("Color");
             Assert.AreEqual("Color (invariant)", result);
         }
diff --git a/test/Askmethat.Aspnet.JsonLocalizer.Test/Localizer/JsonStringLocalizerCustomResourcesTest.cs b/test/Askmethat.Aspnet.JsonLocalizer.Test/Localizer/JsonStringLocalizerCustomResourcesTest.cs
index 5ff46a2..dc22997 100644
--- a/test/Askmethat.Aspnet.JsonLocalizer.Test/Localizer/JsonStringLocalizerCustomResourcesTest.cs
+++ b/test/Askmethat.Aspnet.JsonLocalizer.Test/Localizer/JsonStringLocalizerCustomResourcesTest.cs
@@ -1,13 +1,8 @@
 using Askmethat.Aspnet.JsonLocalizer.Extensions;
 using Askmethat.Aspnet.JsonLocalizer.Localizer;
 using Askmethat.Aspnet.JsonLocalizer.Test.Helpers;
-using Askmethat.Aspnet.JsonLocalizer.TestSample;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.TestHost;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Localization;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System;
 using System.Globalization;
 
 namespace Askmethat.Aspnet.JsonLocalizer.Test.Localizer
diff --git a/test/Askmethat.Aspnet.JsonLocalizer.Test/Localizer/JsonStringLocalizerTest.cs b/test/Askmethat.Aspnet.JsonLocalizer.Test/Localizer/JsonStringLocalizerTest.cs
index 0dcb8cc..647ecff 100644
--- a/test/Askmethat.Aspnet.JsonLocalizer.Test/Localizer/JsonStringLocalizerTest.cs
+++ b/test/Askmethat.Aspnet.JsonLocalizer.Test/Localizer/JsonStringLocalizerTest.cs
@@ -1,14 +1,7 @@
 using Askmethat.Aspnet.JsonLocalizer.Extensions;
-using Askmethat.Aspnet.JsonLocalizer.Localizer;
 using Askmethat.Aspnet.JsonLocalizer.Test.Helpers;
-using Askmethat.Aspnet.JsonLocalizer.TestSample;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.TestHost;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Localization;
-using Microsoft.Extensions.Options;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System;
 using System.Globalization;
 using System.Linq;
 
diff --git a/test/Askmethat.Aspnet.JsonLocalizer.Test/Localizer/MultipleJsonFileTest.cs b/test/Askmethat.Aspnet.JsonLocalizer.Test/Localizer/MultipleJsonFileTest.cs
index d3daad7..0219450 100644
--- a/test/Askmethat.Aspnet.JsonLocalizer.Test/Localizer/MultipleJsonFileTest.cs
+++ b/test/Askmethat.Aspnet.JsonLocalizer.Test/Localizer/MultipleJsonFileTest.cs
@@ -1,16 +1,9 @@
 using Askmethat.Aspnet.JsonLocalizer.Extensions;
 using Askmethat.Aspnet.JsonLocalizer.Localizer;
 using Askmethat.Aspnet.JsonLocalizer.Test.Helpers;
-using Askmethat.Aspnet.JsonLocalizer.TestSample;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.TestHost;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Localization;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
 
 namespace Askmethat.Aspnet.JsonLocalizer.Test.Localizer
 {
diff --git a/test/Askmethat.Aspnet.JsonLocalizer.Test/Localizer/StringFactoryCreateJsonFileTest.cs b/test/Askmethat.Aspnet.JsonLocalizer.Test/Localizer/StringFactoryCreateJsonFileTest.cs
index a618a8f..dc0336b 100644
--- a/test/Askmethat.Aspnet.JsonLocalizer.Test/Localizer/StringFactoryCreateJsonFileTest.cs
+++ b/test/Askmethat.Aspnet.JsonLocalizer.Test/Localizer/StringFactoryCreateJsonFileTest.cs
@@ -1,13 +1,9 @@
-using System.Globalization;
 using Askmethat.Aspnet.JsonLocalizer.Extensions;
 using Askmethat.Aspnet.JsonLocalizer.Localizer;
 using Askmethat.Aspnet.JsonLocalizer.Test.Helpers;
-using Askmethat.Aspnet.JsonLocalizer.TestSample;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.TestHost;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Localization;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Globalization;
 
 namespace Askmethat.Aspnet.JsonLocalizer.Test.Localizer
 {
diff --git a/test/Askmethat.Aspnet.JsonLocalizer.TestSample/Askmethat.Aspnet.JsonLocalizer.TestSample.csproj b/test/Askmethat.Aspnet.JsonLocalizer.TestSample/Askmethat.Aspnet.JsonLocalizer.TestSample.csproj
index 0786028..9928bf5 100644
--- a/test/Askmethat.Aspnet.JsonLocalizer.TestSample/Askmethat.Aspnet.JsonLocalizer.TestSample.csproj
+++ b/test/Askmethat.Aspnet.JsonLocalizer.TestSample/Askmethat.Aspnet.JsonLocalizer.TestSample.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFrameworks>netcoreapp2.0;netcoreapp2.1;</TargetFrameworks>
-    <Version>1.1.6</Version>
+    <Version>2.1.0</Version>
   </PropertyGroup>
   <ItemGroup>
     <Folder Include="wwwroot\" />
diff --git a/test/Askmethat.Aspnet.JsonLocalizer.TestSample/Startup.cs b/test/Askmethat.Aspnet.JsonLocalizer.TestSample/Startup.cs
index 7d79312..978037f 100644
--- a/test/Askmethat.Aspnet.JsonLocalizer.TestSample/Startup.cs
+++ b/test/Askmethat.Aspnet.JsonLocalizer.TestSample/Startup.cs
@@ -31,10 +31,11 @@ public void ConfigureServices(IServiceCollection services)
 
             services.AddMvc().AddViewLocalization();
 
-            var supportedCultures = new[]
+            CultureInfo[] supportedCultures = new[]
                 {
                         new CultureInfo("en-US"),
-                        new CultureInfo("fr-FR")
+                        new CultureInfo("fr-FR"),
+                        new CultureInfo("pt-PT")
                 };
 
             services.AddJsonLocalization(options =>
@@ -42,7 +43,6 @@ public void ConfigureServices(IServiceCollection services)
                 options.ResourcesPath = "json";
                 options.UseBaseName = true;
                 options.CacheDuration = TimeSpan.FromMinutes(15);
-                options.SupportedCultureInfos = supportedCultures.ToHashSet();
             });
 
             services.Configure<RequestLocalizationOptions>(options =>
diff --git a/test/Askmethat.Aspnet.JsonLocalizer.TestSample/Views/Home/Index.cshtml b/test/Askmethat.Aspnet.JsonLocalizer.TestSample/Views/Home/Index.cshtml
index 48b3842..78509f0 100644
--- a/test/Askmethat.Aspnet.JsonLocalizer.TestSample/Views/Home/Index.cshtml
+++ b/test/Askmethat.Aspnet.JsonLocalizer.TestSample/Views/Home/Index.cshtml
@@ -22,6 +22,7 @@
     var cultureItems = LocOptions.Value.SupportedUICultures
         .Select(c => new SelectListItem { Value = c.Name, Text = Localizer[c.Name].Value })
         .ToList();
+
 }
 
 <div>