Transitioned to Json Settings

Files/Models/JsonSettings/BaseJsonSettingsModel.cs

@@ -164,9 +164,7 @@ protected virtual TValue Get<TValue>(TValue defaultValue, [CallerMemberName] str
                 return defaultValue;
             }
 
-            object value = JsonSettingsDatabase.GetValue(propertyName, defaultValue);
-
-            return value is JToken jTokenValue ? jTokenValue.ToObject<TValue>() : (TValue)value;
+            return JsonSettingsDatabase.GetValue<TValue>(propertyName, defaultValue);
         }
 
         protected virtual bool Set<TValue>(TValue value, [CallerMemberName] string propertyName = "")

Files/Models/JsonSettings/IJsonSettingsDatabase.cs

@@ -4,6 +4,8 @@ public interface IJsonSettingsDatabase
     {
         object GetValue(string key, object defaultValue = null);
 
+        TValue GetValue<TValue>(string key, object defaultValue = null);
+
         bool AddKey(string key, object value);
 
         bool RemoveKey(string key);

Files/Models/JsonSettings/Implementation/CachingJsonSettingsDatabase.cs

@@ -13,6 +13,26 @@ public CachingJsonSettingsDatabase(IJsonSettingsSerializer jsonSettingsSerialize
         {
         }
 
+        public override TValue GetValue<TValue>(string key, object defaultValue = null)
+        {
+            if (settingsCache.ContainsKey(key))
+            {
+                var value = settingsCache[key];
+                if (value is Newtonsoft.Json.Linq.JToken jTokenValue)
+                {
+                    var objValue = jTokenValue.ToObject<TValue>();
+                    settingsCache[key] = objValue;
+                    return objValue;
+                }
+                return (TValue)value;
+            }
+            else
+            {
+                _cacheMisses++;
+                return base.GetValue<TValue>(key, defaultValue);
+            }
+        }
+
         public override object GetValue(string key, object defaultValue = null)
         {
             if (settingsCache.ContainsKey(key))

Files/Models/JsonSettings/Implementation/DefaultJsonSettingsDatabase.cs

@@ -34,6 +34,16 @@ protected virtual bool SaveSettingsCache()
             return settingsSerializer.WriteToFile(settingsData);
         }
 
+        public virtual TValue GetValue<TValue>(string key, object defaultValue = null)
+        {
+            var value = GetValue(key, defaultValue);
+            if (value is Newtonsoft.Json.Linq.JToken jTokenValue)
+            {
+                return jTokenValue.ToObject<TValue>();
+            }
+            return (TValue)value;
+        }
+
         public virtual object GetValue(string key, object defaultValue = null)
         {
             this.settingsCache = GetNewSettingsCache();