diff --git a/Directory.Build.props b/Directory.Build.props
index d3815c3e2..3225a2103 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <!-- Set common properties regarding assembly information and nuget packages -->
   <PropertyGroup>
-    <TimeWarpStateVersion>11.0.0-beta.65+8.0.303</TimeWarpStateVersion>
+    <TimeWarpStateVersion>11.0.0-beta.66+8.0.303</TimeWarpStateVersion>
     <Authors>Steven T. Cramer</Authors>
     <Product>TimeWarp State</Product>
     <PackageVersion>$(TimeWarpStateVersion)</PackageVersion>
diff --git a/Source/TimeWarp.State.Plus/State/ICacheableState.cs b/Source/TimeWarp.State.Plus/State/ITimeWarpCacheableState.cs
similarity index 76%
rename from Source/TimeWarp.State.Plus/State/ICacheableState.cs
rename to Source/TimeWarp.State.Plus/State/ITimeWarpCacheableState.cs
index 27913e09f..a2b4155f7 100644
--- a/Source/TimeWarp.State.Plus/State/ICacheableState.cs
+++ b/Source/TimeWarp.State.Plus/State/ITimeWarpCacheableState.cs
@@ -1,6 +1,6 @@
 namespace TimeWarp.State.Plus.State;
 
-public interface ICacheableState
+public interface ITimeWarpCacheableState
 {
   string? CacheKey { get; }
   DateTime? TimeStamp { get; }
diff --git a/Source/TimeWarp.State.Plus/State/BaseCacheableState.cs b/Source/TimeWarp.State.Plus/State/TimeWarpCacheableState.cs
similarity index 90%
rename from Source/TimeWarp.State.Plus/State/BaseCacheableState.cs
rename to Source/TimeWarp.State.Plus/State/TimeWarpCacheableState.cs
index 7be7557fd..acbe58359 100644
--- a/Source/TimeWarp.State.Plus/State/BaseCacheableState.cs
+++ b/Source/TimeWarp.State.Plus/State/TimeWarpCacheableState.cs
@@ -1,15 +1,11 @@
 namespace TimeWarp.State.Plus.State;
 
-public abstract class BaseCacheableState<TState> : State<TState>, ICacheableState
+public abstract class TimeWarpCacheableState<TState> : State<TState>, ITimeWarpCacheableState
+where TState : IState
 {
   public string? CacheKey { get; private set; }
   public DateTime? TimeStamp { get; private set; }
-  public TimeSpan CacheDuration { get; private set; }
-
-  protected BaseCacheableState(TimeSpan cacheDuration)
-  {
-    CacheDuration = cacheDuration;
-  }
+  public TimeSpan CacheDuration { get; protected set; }
   
   /// <summary>
   /// Checks if the cache is valid based on the current cache key and timestamp
diff --git a/Tests/Test.App/Test.App.Client/Features/CacheableWeather/CacheableWeatherState.cs b/Tests/Test.App/Test.App.Client/Features/CacheableWeather/CacheableWeatherState.cs
index 329c63eb3..a95cb21bb 100644
--- a/Tests/Test.App/Test.App.Client/Features/CacheableWeather/CacheableWeatherState.cs
+++ b/Tests/Test.App/Test.App.Client/Features/CacheableWeather/CacheableWeatherState.cs
@@ -3,13 +3,16 @@ namespace Test.App.Client.Features.WeatherForecast;
 using TimeWarp.State.Plus.State;
 using static Contracts.Features.WeatherForecast.GetWeatherForecasts;
 
-internal partial class CacheableWeatherState: BaseCacheableState<CacheableWeatherState>
+internal partial class CacheableWeatherState: TimeWarpCacheableState<CacheableWeatherState>
 {
   private Response? WeatherForecastList;
 
   public IReadOnlyList<WeatherForecastDto>? WeatherForecasts => WeatherForecastList?.AsReadOnly();
 
-  public CacheableWeatherState():base(TimeSpan.FromSeconds(10)) {} // Set this to short duration for testing
+  public CacheableWeatherState()
+  {
+    CacheDuration = TimeSpan.FromSeconds(10);
+  } // Set this to short duration for testing
   
   ///<inheritdoc/>
   public override void Initialize()