Merge branch 'develop' into stable

1 files changed, 26 insertions, 0 deletions

diff --git a/src/SMAPI/Framework/Utilities/TickCacheDictionary.cs b/src/SMAPI/Framework/Utilities/TickCacheDictionary.cs
index 20d206e2..7732ace8 100644
--- a/src/SMAPI/Framework/Utilities/TickCacheDictionary.cs
+++ b/src/SMAPI/Framework/Utilities/TickCacheDictionary.cs
@@ -48,4 +48,30 @@ namespace StardewModdingAPI.Framework.Utilities
             return this.Cache.Remove(cacheKey);
         }
     }
+
+    /// <summary>An in-memory dictionary cache that stores data for the duration of a game update tick.</summary>
+    /// <typeparam name="TKey">The dictionary key type.</typeparam>
+    internal class TickCacheDictionary<TKey> : TickCacheDictionary<TKey, object>
+        where TKey : notnull
+    {
+        /*********
+        ** Public methods
+        *********/
+        /// <summary>Get a value from the cache, fetching it first if it's not cached yet.</summary>
+        /// <param name="cacheKey">The unique key for the cached value.</param>
+        /// <param name="get">Get the latest data if it's not in the cache yet.</param>
+        public TValue GetOrSet<TValue>(TKey cacheKey, Func<TValue> get)
+        {
+            object? value = base.GetOrSet(cacheKey, () => get()!);
+
+            try
+            {
+                return (TValue)value;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidCastException($"Can't cast value of the '{cacheKey}' cache entry from {value?.GetType().FullName ?? "null"} to {typeof(TValue).FullName}.", ex);
+            }
+        }
+    }
 }