diff --git a/Src/Dnn/ToSic.Sxc.Dnn.Core/Dnn/Code/DnnDynamicCodeRootTT.cs b/Src/Dnn/ToSic.Sxc.Dnn.Core/Dnn/Code/DnnDynamicCodeRootTT.cs
index c83e003355..dc9bc9b311 100644
--- a/Src/Dnn/ToSic.Sxc.Dnn.Core/Dnn/Code/DnnDynamicCodeRootTT.cs
+++ b/Src/Dnn/ToSic.Sxc.Dnn.Core/Dnn/Code/DnnDynamicCodeRootTT.cs
@@ -17,6 +17,6 @@ public DnnDynamicCodeRoot(Dependencies dependencies): base(dependencies, DnnCons
         /// Dnn context with module, page, portal etc.
         /// </summary>
         public IDnnContext Dnn => _dnn.Get(GetService<IDnnContext>);
-        private readonly ValueGetOnce<IDnnContext> _dnn = new ValueGetOnce<IDnnContext>();
+        private readonly GetOnce<IDnnContext> _dnn = new GetOnce<IDnnContext>();
     }
 }
\ No newline at end of file
diff --git a/Src/Dnn/ToSic.Sxc.Dnn.Razor/Custom/Hybrid/Advanced/Razor14_TT.cs b/Src/Dnn/ToSic.Sxc.Dnn.Razor/Custom/Hybrid/Advanced/Razor14_TT.cs
index 29782710bc..e198d9ebc2 100644
--- a/Src/Dnn/ToSic.Sxc.Dnn.Razor/Custom/Hybrid/Advanced/Razor14_TT.cs
+++ b/Src/Dnn/ToSic.Sxc.Dnn.Razor/Custom/Hybrid/Advanced/Razor14_TT.cs
@@ -36,6 +36,6 @@ protected Razor14()
         public TModel Model => !(_DynCodeRoot is IDynamicCode<TModel, TServiceKit> root) ? default : root.Model;
 
         public TServiceKit Kit => _kit.Get(() => _DynCodeRoot.GetKit<TServiceKit>());
-        private readonly ValueGetOnce<TServiceKit> _kit = new ValueGetOnce<TServiceKit>();
+        private readonly GetOnce<TServiceKit> _kit = new GetOnce<TServiceKit>();
     }
 }
diff --git a/Src/Dnn/ToSic.Sxc.Dnn.Razor/Engines/Razor/HtmlHelper.cs b/Src/Dnn/ToSic.Sxc.Dnn.Razor/Engines/Razor/HtmlHelper.cs
index e712ac252e..338fae222d 100644
--- a/Src/Dnn/ToSic.Sxc.Dnn.Razor/Engines/Razor/HtmlHelper.cs
+++ b/Src/Dnn/ToSic.Sxc.Dnn.Razor/Engines/Razor/HtmlHelper.cs
@@ -105,6 +105,6 @@ public IHtmlString Partial(string path, params object[] data)
 
         private bool ThrowPartialError => _throwPartialError.Get(() =>
             _features.IsEnabled(RazorThrowPartial.NameId) || _isSystemAdmin && _features.IsEnabled(RenderThrowPartialSystemAdmin.NameId));
-        private readonly ValueGetOnce<bool> _throwPartialError = new ValueGetOnce<bool>();
+        private readonly GetOnce<bool> _throwPartialError = new GetOnce<bool>();
     }
 }
\ No newline at end of file
diff --git a/Src/Dnn/ToSic.Sxc.Dnn.WebApi/Custom/Hybrid/Advanced/Api14_TT.cs b/Src/Dnn/ToSic.Sxc.Dnn.WebApi/Custom/Hybrid/Advanced/Api14_TT.cs
index f38639d97f..051edb40ff 100644
--- a/Src/Dnn/ToSic.Sxc.Dnn.WebApi/Custom/Hybrid/Advanced/Api14_TT.cs
+++ b/Src/Dnn/ToSic.Sxc.Dnn.WebApi/Custom/Hybrid/Advanced/Api14_TT.cs
@@ -31,7 +31,7 @@ protected Api14(string logSuffix) : base(logSuffix) { }
         public TModel Model => !(_DynCodeRoot is IDynamicCode<TModel, TServiceKit> root) ? default : root.Model;
 
         public TServiceKit Kit => _kit.Get(() => _DynCodeRoot.GetKit<TServiceKit>());
-        private readonly ValueGetOnce<TServiceKit> _kit = new ValueGetOnce<TServiceKit>();
+        private readonly GetOnce<TServiceKit> _kit = new GetOnce<TServiceKit>();
 
     }
 }
diff --git a/Src/Dnn/ToSic.Sxc.Dnn.WebApi/WebApi/SxcApiControllerBase.cs b/Src/Dnn/ToSic.Sxc.Dnn.WebApi/WebApi/SxcApiControllerBase.cs
index 598226c16f..67c238f566 100644
--- a/Src/Dnn/ToSic.Sxc.Dnn.WebApi/WebApi/SxcApiControllerBase.cs
+++ b/Src/Dnn/ToSic.Sxc.Dnn.WebApi/WebApi/SxcApiControllerBase.cs
@@ -30,7 +30,7 @@ protected override void Initialize(HttpControllerContext controllerContext)
         protected IContextResolver SharedContextResolver;
 
         [PrivateApi] protected IBlock GetBlock() => _blockOfRequest.Get(() => GetService<DnnGetBlock>().GetCmsBlock(Request, Log));
-        private readonly ValueGetOnce<IBlock> _blockOfRequest = new ValueGetOnce<IBlock>();
+        private readonly GetOnce<IBlock> _blockOfRequest = new GetOnce<IBlock>();
 
     }
 }
diff --git a/Src/Dnn/ToSic.Sxc.Dnn/View.ascx.cs b/Src/Dnn/ToSic.Sxc.Dnn/View.ascx.cs
index ee6da561cb..0d1827321b 100644
--- a/Src/Dnn/ToSic.Sxc.Dnn/View.ascx.cs
+++ b/Src/Dnn/ToSic.Sxc.Dnn/View.ascx.cs
@@ -29,12 +29,12 @@ public partial class View : PortalModuleBase, IActionable
         /// which runs before page-load
         /// </summary>
         private IBlock Block => _blockGetOnce.Get(() => LogTimer.DoInTimer(() => GetService<IModuleAndBlockBuilder>().Init(Log).GetBlock(ModuleConfiguration, null)));
-        private readonly ValueGetOnce<IBlock> _blockGetOnce = new ValueGetOnce<IBlock>();
+        private readonly GetOnce<IBlock> _blockGetOnce = new GetOnce<IBlock>();
 
         private ILog Log { get; } = new Log("Sxc.View");
 
         protected LogCall LogTimer => _logTimer.Get(() => Log.Fn(message: $"Page:{TabId} '{Page?.Title}', Module:{ModuleId} '{ModuleConfiguration.ModuleTitle}'"));
-        private readonly ValueGetOnce<LogCall> _logTimer = new ValueGetOnce<LogCall>();
+        private readonly GetOnce<LogCall> _logTimer = new GetOnce<LogCall>();
 
         /// <summary>
         /// Page Load event
@@ -163,6 +163,6 @@ private IRenderResult RenderViewAndGatherJsCssSpecs()
 
 
         protected IOutputCache OutputCache => _oc.Get(() => GetService<IOutputCache>().Init(Log).Init(ModuleId, TabId, Block));
-        private readonly ValueGetOnce<IOutputCache> _oc = new ValueGetOnce<IOutputCache>();
+        private readonly GetOnce<IOutputCache> _oc = new GetOnce<IOutputCache>();
     }
 }
\ No newline at end of file
diff --git a/Src/Oqtane/ToSic.Sxc.Oqt.Server/Blocks/OqtSxcViewBuilder.cs b/Src/Oqtane/ToSic.Sxc.Oqt.Server/Blocks/OqtSxcViewBuilder.cs
index 5150fc01e4..b5988a883a 100644
--- a/Src/Oqtane/ToSic.Sxc.Oqt.Server/Blocks/OqtSxcViewBuilder.cs
+++ b/Src/Oqtane/ToSic.Sxc.Oqt.Server/Blocks/OqtSxcViewBuilder.cs
@@ -119,14 +119,14 @@ public OqtViewResultsDto Prepare(Alias alias, Site site, Page page, Module modul
             _contextResolverForLookUps.AttachRealBlock(() => block);
             return block;
         }));
-        private readonly ValueGetOnce<IBlock> _blockGetOnce = new();
+        private readonly GetOnce<IBlock> _blockGetOnce = new();
 
         protected LogCall LogTimer => _logTimer.Get(() => Log.Fn(message: $"Page:{Page?.PageId} '{Page?.Name}', Module:{Module?.ModuleId} '{Module?.Title}'"));
-        private readonly ValueGetOnce<LogCall> _logTimer = new();
+        private readonly GetOnce<LogCall> _logTimer = new();
 
 
         protected IOutputCache OutputCache => _oc.Get(() => _outputCache.Init(Log).Init(Module.ModuleId, Page?.PageId ?? 0, Block));
-        private readonly ValueGetOnce<IOutputCache> _oc = new();
+        private readonly GetOnce<IOutputCache> _oc = new();
 
         #endregion
     }
diff --git a/Src/Oqtane/ToSic.Sxc.Oqt.Server/Custom/Hybrid/Advanced/Hybrid.Api14_TT.cs b/Src/Oqtane/ToSic.Sxc.Oqt.Server/Custom/Hybrid/Advanced/Hybrid.Api14_TT.cs
index b3fcef0cf3..38c679b64a 100644
--- a/Src/Oqtane/ToSic.Sxc.Oqt.Server/Custom/Hybrid/Advanced/Hybrid.Api14_TT.cs
+++ b/Src/Oqtane/ToSic.Sxc.Oqt.Server/Custom/Hybrid/Advanced/Hybrid.Api14_TT.cs
@@ -19,7 +19,7 @@ public abstract class Api14<TModel, TServiceKit> : Api12, IDynamicCode<TModel, T
         public TModel Model => _DynCodeRoot is not IDynamicCode<TModel, TServiceKit> root ? default : root.Model;
 
         public TServiceKit Kit => _kit.Get(() => _DynCodeRoot.GetKit<TServiceKit>());
-        private readonly ValueGetOnce<TServiceKit> _kit = new();
+        private readonly GetOnce<TServiceKit> _kit = new();
 
     }
 }
\ No newline at end of file
diff --git a/Src/Razor/ToSic.Sxc.Razor/Custom.Hybrid/Advanced/Razor14_TT.cs b/Src/Razor/ToSic.Sxc.Razor/Custom.Hybrid/Advanced/Razor14_TT.cs
index ed9079c3d4..4d547fe172 100644
--- a/Src/Razor/ToSic.Sxc.Razor/Custom.Hybrid/Advanced/Razor14_TT.cs
+++ b/Src/Razor/ToSic.Sxc.Razor/Custom.Hybrid/Advanced/Razor14_TT.cs
@@ -12,6 +12,6 @@ public abstract class Razor14<TModel, TServiceKit>: Razor12<TModel>, IRazor14<TM
         where TServiceKit : ServiceKit
     {
         public TServiceKit Kit => _kit.Get(() => _DynCodeRoot.GetKit<TServiceKit>());
-        private readonly ValueGetOnce<TServiceKit> _kit = new();
+        private readonly GetOnce<TServiceKit> _kit = new();
     }
 }
diff --git a/Src/Sxc/ToSic.Sxc/Blocks/BlockBuilder_Render.cs b/Src/Sxc/ToSic.Sxc/Blocks/BlockBuilder_Render.cs
index 84f2fa5056..072faf3bdb 100644
--- a/Src/Sxc/ToSic.Sxc/Blocks/BlockBuilder_Render.cs
+++ b/Src/Sxc/ToSic.Sxc/Blocks/BlockBuilder_Render.cs
@@ -17,7 +17,7 @@ public partial class BlockBuilder
 
         [PrivateApi]
         public IRenderingHelper RenderingHelper => _rendHelp.Get(() => _deps.RenderHelpGen.New.Init(Block, Log));
-        private readonly ValueGetOnce<IRenderingHelper> _rendHelp = new ValueGetOnce<IRenderingHelper>();
+        private readonly GetOnce<IRenderingHelper> _rendHelp = new GetOnce<IRenderingHelper>();
 
         public IRenderResult Run(bool topLevel)
         {
@@ -200,7 +200,7 @@ public IRenderResult Run(bool topLevel)
         /// license ok state
         /// </summary>
         protected bool LicenseOk => _licenseOk.Get(() => _deps.LicenseService.Value.HaveValidLicense);
-        private readonly ValueGetOnce<bool> _licenseOk = new ValueGetOnce<bool>();
+        private readonly GetOnce<bool> _licenseOk = new GetOnce<bool>();
 
         private string GenerateWarningMsgIfLicenseNotOk()
         {
diff --git a/Src/Sxc/ToSic.Sxc/Blocks/RenderResult.cs b/Src/Sxc/ToSic.Sxc/Blocks/RenderResult.cs
index d626a31598..a44a834b68 100644
--- a/Src/Sxc/ToSic.Sxc/Blocks/RenderResult.cs
+++ b/Src/Sxc/ToSic.Sxc/Blocks/RenderResult.cs
@@ -16,7 +16,7 @@ public class RenderResult : HybridHtmlString, IRenderResult
         public string Html { get; set; }
 
         public int Size => _size.Get(() => Html?.Length ?? 0);
-        private readonly ValueGetOnce<int> _size = new ValueGetOnce<int>();
+        private readonly GetOnce<int> _size = new GetOnce<int>();
 
         /// <inheritdoc />
         public bool CanCache { get; set; }
diff --git a/Src/Sxc/ToSic.Sxc/Code/DynamicCodeRootTT.cs b/Src/Sxc/ToSic.Sxc/Code/DynamicCodeRootTT.cs
index 99414feffd..9a3689e5aa 100644
--- a/Src/Sxc/ToSic.Sxc/Code/DynamicCodeRootTT.cs
+++ b/Src/Sxc/ToSic.Sxc/Code/DynamicCodeRootTT.cs
@@ -15,6 +15,6 @@ protected DynamicCodeRoot(Dependencies dependencies, string logPrefix) : base(de
         //private readonly ValueGetOnce<TModel> _mOnce = new ValueGetOnce<TModel>();
 
         public TServiceKit Kit => _kit.Get(GetService<TServiceKit>);
-        private readonly ValueGetOnce<TServiceKit> _kit = new ValueGetOnce<TServiceKit>();
+        private readonly GetOnce<TServiceKit> _kit = new GetOnce<TServiceKit>();
     }
 }
diff --git a/Src/Sxc/ToSic.Sxc/Code/DynamicCodeRoot_As.cs b/Src/Sxc/ToSic.Sxc/Code/DynamicCodeRoot_As.cs
index e6d34838fe..13aafbe0ef 100644
--- a/Src/Sxc/ToSic.Sxc/Code/DynamicCodeRoot_As.cs
+++ b/Src/Sxc/ToSic.Sxc/Code/DynamicCodeRoot_As.cs
@@ -138,7 +138,7 @@ public IEnumerable<dynamic> AsList(object list)
 
         internal AdamManager AdamManager => _admMng.Get(() => GetService<AdamManager>()
             .Init(ContextForAdamManager(), CompatibilityLevel, Log));
-        private readonly ValueGetOnce<AdamManager> _admMng = new ValueGetOnce<AdamManager>();
+        private readonly GetOnce<AdamManager> _admMng = new GetOnce<AdamManager>();
 
         /// <summary>
         /// Special helper - if the DynamicCode is generated by the service or used in a WebApi there is no block, but we can figure out the context.
diff --git a/Src/Sxc/ToSic.Sxc/Context/CmsContext/CmsContext.cs b/Src/Sxc/ToSic.Sxc/Context/CmsContext/CmsContext.cs
index 64c1f237c8..c799805e46 100644
--- a/Src/Sxc/ToSic.Sxc/Context/CmsContext/CmsContext.cs
+++ b/Src/Sxc/ToSic.Sxc/Context/CmsContext/CmsContext.cs
@@ -42,7 +42,7 @@ Lazy<ICmsSite> cmsSiteLazy
         private readonly Lazy<IPage> _pageLazy;
 
         internal IContextOfSite CtxSite => _ctxSite.Get(() => CtxBlockOrNull ?? _initialContext);
-        private readonly ValueGetOnce<IContextOfSite> _ctxSite = new ValueGetOnce<IContextOfSite>();
+        private readonly GetOnce<IContextOfSite> _ctxSite = new GetOnce<IContextOfSite>();
 
         private readonly IAppStates _appStates;
         private readonly Lazy<ICmsSite> _cmsSiteLazy;
@@ -57,21 +57,21 @@ Lazy<ICmsSite> cmsSiteLazy
         internal DynamicEntityDependencies DEDeps => (CodeRoot as DynamicCodeRoot)?.DynamicEntityDependencies;
 
         private AppState SiteAppState => _siteAppState.Get(() => _appStates.GetPrimaryApp(CtxSite.Site.ZoneId, Log));
-        private readonly ValueGetOnce<AppState> _siteAppState = new ValueGetOnce<AppState>();
+        private readonly GetOnce<AppState> _siteAppState = new GetOnce<AppState>();
 
 
         private IBlock RealBlockOrNull => _realBlock.Get(() => CodeRoot?.Block);
-        private readonly ValueGetOnce<IBlock> _realBlock = new ValueGetOnce<IBlock>();
+        private readonly GetOnce<IBlock> _realBlock = new GetOnce<IBlock>();
 
         internal IContextOfBlock CtxBlockOrNull => _ctxBlock.Get(() => CodeRoot?.Block?.Context);
-        private readonly ValueGetOnce<IContextOfBlock> _ctxBlock = new ValueGetOnce<IContextOfBlock>();
+        private readonly GetOnce<IContextOfBlock> _ctxBlock = new GetOnce<IContextOfBlock>();
 
         #endregion
 
         public ICmsPlatform Platform { get; }
 
         public ICmsSite Site => _site.Get(() => _cmsSiteLazy.Value.Init(this, SiteAppState));
-        private readonly ValueGetOnce<ICmsSite> _site = new ValueGetOnce<ICmsSite>();
+        private readonly GetOnce<ICmsSite> _site = new GetOnce<ICmsSite>();
 
         public ICmsPage Page => _page ?? (_page = new CmsPage(this, SiteAppState, _pageLazy));
         private ICmsPage _page;
diff --git a/Src/Sxc/ToSic.Sxc/Context/CmsContext/CmsContextPartBase.cs b/Src/Sxc/ToSic.Sxc/Context/CmsContext/CmsContextPartBase.cs
index 798d430f39..9beaecf73a 100644
--- a/Src/Sxc/ToSic.Sxc/Context/CmsContext/CmsContextPartBase.cs
+++ b/Src/Sxc/ToSic.Sxc/Context/CmsContext/CmsContextPartBase.cs
@@ -22,10 +22,10 @@ protected void Init(CmsContext parent, T contents)
         }
 
         public IDynamicMetadata Metadata => _dynMeta.Get(() => new DynamicMetadata((this as IHasMetadata).Metadata, null, _parent.DEDeps));
-        private readonly ValueGetOnce<IDynamicMetadata> _dynMeta = new ValueGetOnce<IDynamicMetadata>();
+        private readonly GetOnce<IDynamicMetadata> _dynMeta = new GetOnce<IDynamicMetadata>();
 
         IMetadataOf IHasMetadata.Metadata => _md.Get(GetMetadataOf);
-        private readonly ValueGetOnce<IMetadataOf> _md = new ValueGetOnce<IMetadataOf>();
+        private readonly GetOnce<IMetadataOf> _md = new GetOnce<IMetadataOf>();
 
         protected abstract IMetadataOf GetMetadataOf();
 
diff --git a/Src/Sxc/ToSic.Sxc/Context/CmsContext/CmsSite.cs b/Src/Sxc/ToSic.Sxc/Context/CmsContext/CmsSite.cs
index 43d5241275..30752b5275 100644
--- a/Src/Sxc/ToSic.Sxc/Context/CmsContext/CmsSite.cs
+++ b/Src/Sxc/ToSic.Sxc/Context/CmsContext/CmsSite.cs
@@ -31,7 +31,7 @@ public ICmsSite Init(CmsContext parent, AppState appState)
         public string UrlRoot => _contents.UrlRoot ?? string.Empty;
 
         public IApp App => _app.Get(() => _siteAppLazy.Value.Init(_appState, null, null));
-        private readonly ValueGetOnce<IApp> _app = new ValueGetOnce<IApp>();
+        private readonly GetOnce<IApp> _app = new GetOnce<IApp>();
 
         protected override IMetadataOf GetMetadataOf() 
             => ExtendWithRecommendations(_appState.GetMetadataOf(TargetTypes.Site, Id, Url));
diff --git a/Src/Sxc/ToSic.Sxc/Custom.Hybrid/Advanced/Code14_TT.cs b/Src/Sxc/ToSic.Sxc/Custom.Hybrid/Advanced/Code14_TT.cs
index ed31512811..65ffad4e21 100644
--- a/Src/Sxc/ToSic.Sxc/Custom.Hybrid/Advanced/Code14_TT.cs
+++ b/Src/Sxc/ToSic.Sxc/Custom.Hybrid/Advanced/Code14_TT.cs
@@ -28,7 +28,7 @@ public abstract class Code14<TModel, TServiceKit>: DynamicCode, IDynamicCode14<T
         public TModel Model => !(_DynCodeRoot is IDynamicCode<TModel, TServiceKit> root) ? default : root.Model;
 
         public TServiceKit Kit => _kit.Get(() => _DynCodeRoot.GetKit<TServiceKit>());
-        private readonly ValueGetOnce<TServiceKit> _kit = new ValueGetOnce<TServiceKit>();
+        private readonly GetOnce<TServiceKit> _kit = new GetOnce<TServiceKit>();
 
         /// <inheritdoc />
         public dynamic Resources => _DynCodeRoot?.Resources;
diff --git a/Src/Sxc/ToSic.Sxc/Data/DynamicEntityBase/DynamicEntityBase.cs b/Src/Sxc/ToSic.Sxc/Data/DynamicEntityBase/DynamicEntityBase.cs
index 992b329a41..1c6d2b0a9f 100644
--- a/Src/Sxc/ToSic.Sxc/Data/DynamicEntityBase/DynamicEntityBase.cs
+++ b/Src/Sxc/ToSic.Sxc/Data/DynamicEntityBase/DynamicEntityBase.cs
@@ -55,7 +55,7 @@ internal static IDynamicEntity SubDynEntityOrNull(IEntity contents, DynamicEntit
         #endregion
 
         protected ILog LogOrNull => _logOrNull.Get(() => _Dependencies.LogOrNull?.SubLogOrNull("DynEnt", Debug));
-        private readonly ValueGetOnce<ILog> _logOrNull = new ValueGetOnce<ILog>();
+        private readonly GetOnce<ILog> _logOrNull = new GetOnce<ILog>();
 
     }
 }
diff --git a/Src/Sxc/ToSic.Sxc/Data/Field/DynamicField.cs b/Src/Sxc/ToSic.Sxc/Data/Field/DynamicField.cs
index 72bfc4a411..28d26366d8 100644
--- a/Src/Sxc/ToSic.Sxc/Data/Field/DynamicField.cs
+++ b/Src/Sxc/ToSic.Sxc/Data/Field/DynamicField.cs
@@ -21,19 +21,19 @@ internal DynamicField(IDynamicEntity parent, string name)
 
         /// <inheritdoc />
         public dynamic Raw => _raw.Get(() => Parent.Get(Name, convertLinks: false));
-        private readonly ValueGetOnce<dynamic> _raw = new ValueGetOnce<dynamic>();
+        private readonly GetOnce<dynamic> _raw = new GetOnce<dynamic>();
 
 
         /// <inheritdoc />
         public dynamic Value => _value.Get(() => Parent.Get(Name, convertLinks: true));
-        private readonly ValueGetOnce<dynamic> _value = new ValueGetOnce<dynamic>();
+        private readonly GetOnce<dynamic> _value = new GetOnce<dynamic>();
 
         /// <inheritdoc />
         public string Url => Value as string;
 
 
         public IDynamicMetadata Metadata => _dynMeta.Get(() => new DynamicMetadata(MetadataOfItem, Parent.Entity, Parent._Dependencies));
-        private readonly ValueGetOnce<IDynamicMetadata> _dynMeta = new ValueGetOnce<IDynamicMetadata>();
+        private readonly GetOnce<IDynamicMetadata> _dynMeta = new GetOnce<IDynamicMetadata>();
 
 
         /// <inheritdoc />
@@ -43,7 +43,7 @@ internal DynamicField(IDynamicEntity parent, string name)
                 var app = Parent._Dependencies?.BlockOrNull?.Context?.AppState;
                 return app?.GetMetadataOf(TargetTypes.CmsItem, valString, "");
             });
-        private readonly ValueGetOnce<IMetadataOf> _itemMd = new ValueGetOnce<IMetadataOf>();
+        private readonly GetOnce<IMetadataOf> _itemMd = new GetOnce<IMetadataOf>();
 
 
 
@@ -52,7 +52,7 @@ internal DynamicField(IDynamicEntity parent, string name)
             var decItem = MetadataOfItem?.FirstOrDefaultOfType(ImageDecorator.TypeName);
             return decItem != null ? new ImageDecorator(decItem) : null;
         });
-        private readonly ValueGetOnce<ImageDecorator> _imgDec2 = new ValueGetOnce<ImageDecorator>();
+        private readonly GetOnce<ImageDecorator> _imgDec2 = new GetOnce<ImageDecorator>();
         
         IMetadataOf IHasMetadata.Metadata => MetadataOfItem;
     }
diff --git a/Src/Sxc/ToSic.Sxc/Edit/Toolbar/Builder/ToolbarBuilder_Helpers.cs b/Src/Sxc/ToSic.Sxc/Edit/Toolbar/Builder/ToolbarBuilder_Helpers.cs
index 9ca1042e19..23f3184f9c 100644
--- a/Src/Sxc/ToSic.Sxc/Edit/Toolbar/Builder/ToolbarBuilder_Helpers.cs
+++ b/Src/Sxc/ToSic.Sxc/Edit/Toolbar/Builder/ToolbarBuilder_Helpers.cs
@@ -16,6 +16,6 @@ public partial class ToolbarBuilder
 
 
         private ObjectToUrl O2U => _o2u.Get(() => new ObjectToUrl());
-        private readonly ValueGetOnce<ObjectToUrl> _o2u = new ValueGetOnce<ObjectToUrl>();
+        private readonly GetOnce<ObjectToUrl> _o2u = new GetOnce<ObjectToUrl>();
     }
 }
diff --git a/Src/Sxc/ToSic.Sxc/Edit/Toolbar/ItemToolbar/ItemToolbarV10.cs b/Src/Sxc/ToSic.Sxc/Edit/Toolbar/ItemToolbar/ItemToolbarV10.cs
index 00f8ceaf50..86735335fd 100644
--- a/Src/Sxc/ToSic.Sxc/Edit/Toolbar/ItemToolbar/ItemToolbarV10.cs
+++ b/Src/Sxc/ToSic.Sxc/Edit/Toolbar/ItemToolbar/ItemToolbarV10.cs
@@ -25,7 +25,7 @@ public override string ToolbarAsTag
             => ToolbarTagTemplate.Replace(ToolbarTagPlaceholder, ToolbarAttributes(JsonToolbarNodeName));
 
         protected override string ToolbarJson => _toolbarJson.Get(ToolbarV10Json);
-        private readonly ValueGetOnce<string> _toolbarJson = new ValueGetOnce<string>();
+        private readonly GetOnce<string> _toolbarJson = new GetOnce<string>();
 
         public override string ToolbarAsAttributes() => ToolbarAttributes(ToolbarAttributeName);
 
diff --git a/Src/Sxc/ToSic.Sxc/Edit/Toolbar/Rules/ToolbarRuleForEntity.cs b/Src/Sxc/ToSic.Sxc/Edit/Toolbar/Rules/ToolbarRuleForEntity.cs
index 6a72717088..ccbacc7cf5 100644
--- a/Src/Sxc/ToSic.Sxc/Edit/Toolbar/Rules/ToolbarRuleForEntity.cs
+++ b/Src/Sxc/ToSic.Sxc/Edit/Toolbar/Rules/ToolbarRuleForEntity.cs
@@ -49,10 +49,10 @@ private void SetPropsToSerialize(bool defaultSerialize, string[] opposite)
         
 
         protected IEntity TargetEntity => _entity.Get(() => Target as IEntity ?? (Target as IEntityWrapper)?.Entity);
-        private readonly ValueGetOnce<IEntity> _entity = new ValueGetOnce<IEntity>();
+        private readonly GetOnce<IEntity> _entity = new GetOnce<IEntity>();
 
         internal EntityEditInfo EditInfo => _editInfo.Get(() => new EntityEditInfo(TargetEntity));
-        private readonly ValueGetOnce<EntityEditInfo> _editInfo = new ValueGetOnce<EntityEditInfo>();
+        private readonly GetOnce<EntityEditInfo> _editInfo = new GetOnce<EntityEditInfo>();
 
         protected override string DecoratorTypeName => TargetEntity?.Type?.Name;
 
diff --git a/Src/Sxc/ToSic.Sxc/Edit/Toolbar/Rules/ToolbarRuleTargeted.cs b/Src/Sxc/ToSic.Sxc/Edit/Toolbar/Rules/ToolbarRuleTargeted.cs
index dfa02441da..dcc7102af6 100644
--- a/Src/Sxc/ToSic.Sxc/Edit/Toolbar/Rules/ToolbarRuleTargeted.cs
+++ b/Src/Sxc/ToSic.Sxc/Edit/Toolbar/Rules/ToolbarRuleTargeted.cs
@@ -52,7 +52,7 @@ public override string GeneratedUiParams()
             var decoTypeName = DecoratorTypeName;
             return decoTypeName.HasValue() ? DecoHelper?.GetDecorator(Context, decoTypeName ?? "", Command) : null;
         });
-        private readonly ValueGetOnce<ToolbarButtonDecorator> _decorator = new ValueGetOnce<ToolbarButtonDecorator>();
+        private readonly GetOnce<ToolbarButtonDecorator> _decorator = new GetOnce<ToolbarButtonDecorator>();
         private string UiParams() => Decorator?.AllRules();
 
         #endregion
diff --git a/Src/Sxc/ToSic.Sxc/Images/ImageService/ImageService.cs b/Src/Sxc/ToSic.Sxc/Images/ImageService/ImageService.cs
index 6fa6b809c8..5b9996391d 100644
--- a/Src/Sxc/ToSic.Sxc/Images/ImageService/ImageService.cs
+++ b/Src/Sxc/ToSic.Sxc/Images/ImageService/ImageService.cs
@@ -29,7 +29,7 @@ public void ConnectToRoot(IDynamicCodeRoot codeRoot)
         internal IEditService EditOrNull => _codeRootOrNull?.Edit;
 
         internal IToolbarService ToolbarOrNull => _toolbarSvc.Get(() => _codeRootOrNull?.GetService<IToolbarService>());
-        private readonly ValueGetOnce<IToolbarService> _toolbarSvc = new ValueGetOnce<IToolbarService>();
+        private readonly GetOnce<IToolbarService> _toolbarSvc = new GetOnce<IToolbarService>();
 
         #endregion
 
diff --git a/Src/Sxc/ToSic.Sxc/Images/Responsive/ResponsiveBase.cs b/Src/Sxc/ToSic.Sxc/Images/Responsive/ResponsiveBase.cs
index a012f02748..afd924ba1b 100644
--- a/Src/Sxc/ToSic.Sxc/Images/Responsive/ResponsiveBase.cs
+++ b/Src/Sxc/ToSic.Sxc/Images/Responsive/ResponsiveBase.cs
@@ -29,7 +29,7 @@ protected ResponsiveBase(ImageService imgService, ResponsiveParams callParams, s
             Log.A(ImgService.Debug, $"{nameof(ThisResize)}: " + t?.Dump());
             return t;
         });
-        private readonly ValueGetOnce<OneResize> _thisResize = new ValueGetOnce<OneResize>();
+        private readonly GetOnce<OneResize> _thisResize = new GetOnce<OneResize>();
 
 
         internal IResizeSettings Settings => Call.Settings;
@@ -75,7 +75,7 @@ public virtual Img Img
         private Img _imgTag;
 
         public ITag Tag => _tag.Get(GetTagWithToolbar);
-        private readonly ValueGetOnce<ITag> _tag = new ValueGetOnce<ITag>();
+        private readonly GetOnce<ITag> _tag = new GetOnce<ITag>();
 
         protected virtual ITag GetOutermostTag() => Img;
 
@@ -106,12 +106,12 @@ private ITag GetTagWithToolbar()
 
         /// <inheritdoc />
         public string Alt => _alt.Get(() => Call.ImgAlt ?? Call.Field?.ImageDecoratorOrNull?.Description);
-        private readonly ValueGetOnce<string> _alt = new ValueGetOnce<string>();
+        private readonly GetOnce<string> _alt = new GetOnce<string>();
 
 
         /// <inheritdoc />
         public string Class => _imgClass.Get(ClassGenerator);
-        private readonly ValueGetOnce<string> _imgClass = new ValueGetOnce<string>();
+        private readonly GetOnce<string> _imgClass = new GetOnce<string>();
         private string ClassGenerator()
         {
             var wrapLog = Log.Fn<string>(ImgService.Debug);
@@ -135,7 +135,7 @@ private string ClassGenerator()
 
         /// <inheritdoc />
         public string SrcSet => _srcSet.Get(SrcSetGenerator);
-        private readonly ValueGetOnce<string> _srcSet = new ValueGetOnce<string>();
+        private readonly GetOnce<string> _srcSet = new GetOnce<string>();
         private string SrcSetGenerator()
         {
             var isEnabled = ImgService.Features.IsEnabled(ImageServiceMultipleSizes.NameId);
@@ -151,7 +151,7 @@ private string SrcSetGenerator()
 
         /// <inheritdoc />
         public string Width => _width.Get(WidthGenerator);
-        private readonly ValueGetOnce<string> _width = new ValueGetOnce<string>();
+        private readonly GetOnce<string> _width = new GetOnce<string>();
         private string WidthGenerator()
         {
             var setWidth = ThisResize.Recipe?.SetWidth;
@@ -166,7 +166,7 @@ private string WidthGenerator()
 
         /// <inheritdoc />
         public string Height => _height.Get(HeightGenerator);
-        private readonly ValueGetOnce<string> _height = new ValueGetOnce<string>();
+        private readonly GetOnce<string> _height = new GetOnce<string>();
         private string HeightGenerator()
         {
             var setHeight = ThisResize.Recipe?.SetHeight;
@@ -179,7 +179,7 @@ private string HeightGenerator()
 
 
         public string Sizes => _sizes.Get(SizesGenerator);
-        private readonly ValueGetOnce<string> _sizes = new ValueGetOnce<string>();
+        private readonly GetOnce<string> _sizes = new GetOnce<string>();
         private string SizesGenerator()
         {
             var wrapLog = Log.Fn<string>(ImgService.Debug);
diff --git a/Src/Sxc/ToSic.Sxc/Images/Responsive/ResponsiveImage.cs b/Src/Sxc/ToSic.Sxc/Images/Responsive/ResponsiveImage.cs
index a18fa55c99..7adfa0f272 100644
--- a/Src/Sxc/ToSic.Sxc/Images/Responsive/ResponsiveImage.cs
+++ b/Src/Sxc/ToSic.Sxc/Images/Responsive/ResponsiveImage.cs
@@ -21,7 +21,7 @@ internal ResponsiveImage(ImageService imgService, ResponsiveParams callParams) :
             if (!string.IsNullOrEmpty(Sizes)) img.Sizes(Sizes);
             return img;
         });
-        private readonly ValueGetOnce<Img> _img2 = new ValueGetOnce<Img>();
+        private readonly GetOnce<Img> _img2 = new GetOnce<Img>();
 
     }
 }
diff --git a/Src/Sxc/ToSic.Sxc/Images/Responsive/ResponsivePicture.cs b/Src/Sxc/ToSic.Sxc/Images/Responsive/ResponsivePicture.cs
index add062e4d8..af05b82638 100644
--- a/Src/Sxc/ToSic.Sxc/Images/Responsive/ResponsivePicture.cs
+++ b/Src/Sxc/ToSic.Sxc/Images/Responsive/ResponsivePicture.cs
@@ -18,12 +18,12 @@ internal ResponsivePicture(ImageService imgService, ResponsiveParams callParams)
 
 
         public Picture Picture => _picTag.Get(() => Razor.Blade.Tag.Picture(Sources, Img));
-        private readonly ValueGetOnce<Picture> _picTag = new ValueGetOnce<Picture>();
+        private readonly GetOnce<Picture> _picTag = new GetOnce<Picture>();
 
         protected override ITag GetOutermostTag() => Picture;
 
         public TagList Sources => _sourceTags.Get(() => SourceTagsInternal(Call.Link.Url, Settings));
-        private readonly ValueGetOnce<TagList> _sourceTags = new ValueGetOnce<TagList>();
+        private readonly GetOnce<TagList> _sourceTags = new GetOnce<TagList>();
 
         private TagList SourceTagsInternal(string url, IResizeSettings resizeSettings)
         {
diff --git a/Src/Sxc/ToSic.Sxc/Services/ServiceKits/ServiceKit14.cs b/Src/Sxc/ToSic.Sxc/Services/ServiceKits/ServiceKit14.cs
index 43e5f79f44..60b9dd68d4 100644
--- a/Src/Sxc/ToSic.Sxc/Services/ServiceKits/ServiceKit14.cs
+++ b/Src/Sxc/ToSic.Sxc/Services/ServiceKits/ServiceKit14.cs
@@ -20,20 +20,20 @@ public class ServiceKit14: ServiceKit
         /// The ADAM Service, used to retrieve files and maybe more. 
         /// </summary>
         public IAdamService Adam => _adam.Get(GetService<IAdamService>);
-        private readonly ValueGetOnce<IAdamService> _adam = new ValueGetOnce<IAdamService>();
+        private readonly GetOnce<IAdamService> _adam = new GetOnce<IAdamService>();
 
         /// <summary>
         /// The Convert Service, used to convert any kind of data type to another data type
         /// </summary>
         public IConvertService Convert => _convert.Get(GetService<IConvertService>);
-        private readonly ValueGetOnce<IConvertService> _convert = new ValueGetOnce<IConvertService>();
+        private readonly GetOnce<IConvertService> _convert = new GetOnce<IConvertService>();
 
         /// <summary>
         /// The Koi CSS Service, used to detect the current CSS framework and other features.
         /// See [ICss](xref:Connect.Koi.ICss)
         /// </summary>
         public ICss Css => _css.Get(GetService<ICss>);
-        private readonly ValueGetOnce<ICss> _css = new ValueGetOnce<ICss>();
+        private readonly GetOnce<ICss> _css = new GetOnce<ICss>();
 
 
         // Wait till we have a signature without the IEntity, but more an IHasEntity or something
@@ -48,82 +48,82 @@ public class ServiceKit14: ServiceKit
         /// The Edit service, same as the main Edit service
         /// </summary>
         public IEditService Edit => _edit.Get(GetService<IEditService>);
-        private readonly ValueGetOnce<IEditService> _edit = new ValueGetOnce<IEditService>();
+        private readonly GetOnce<IEditService> _edit = new GetOnce<IEditService>();
 
 
         /// <summary>
         /// The Features services, used to check if features are enabled
         /// </summary>
         public IFeaturesService Feature => _features.Get(GetService<IFeaturesService>);
-        private readonly ValueGetOnce<IFeaturesService> _features = new ValueGetOnce<IFeaturesService>();
+        private readonly GetOnce<IFeaturesService> _features = new GetOnce<IFeaturesService>();
 
 
         /// <summary>
         /// The Images service, used to create `img` and `picture` tags
         /// </summary>
         public IImageService Image => _image.Get(GetService<IImageService>);
-        private readonly ValueGetOnce<IImageService> _image = new ValueGetOnce<IImageService>();
+        private readonly GetOnce<IImageService> _image = new GetOnce<IImageService>();
 
 
         /// <summary>
         /// The JSON service, used to convert data to-and-from JSON
         /// </summary>
         public IJsonService Json => _json.Get(GetService<IJsonService>);
-        private readonly ValueGetOnce<IJsonService> _json = new ValueGetOnce<IJsonService>();
+        private readonly GetOnce<IJsonService> _json = new GetOnce<IJsonService>();
 
 
         /// <summary>
         /// The JSON service, used to convert data to-and-from JSON
         /// </summary>
         public ILinkService Link => _link.Get(GetService<ILinkService>);
-        private readonly ValueGetOnce<ILinkService> _link = new ValueGetOnce<ILinkService>();
+        private readonly GetOnce<ILinkService> _link = new GetOnce<ILinkService>();
 
         /// <summary>
         /// The System Log service, used to add log messages to the system (Dnn/Oqtane)
         /// </summary>
         public ILogService Log => _sysLog.Get(GetService<ILogService>);
-        private readonly ValueGetOnce<ILogService> _sysLog = new ValueGetOnce<ILogService>();
+        private readonly GetOnce<ILogService> _sysLog = new GetOnce<ILogService>();
 
 
         /// <summary>
         /// The Mail service, used to send mails
         /// </summary>
         public IMailService Mail => _mail.Get(GetService<IMailService>);
-        private readonly ValueGetOnce<IMailService> _mail = new ValueGetOnce<IMailService>();
+        private readonly GetOnce<IMailService> _mail = new GetOnce<IMailService>();
 
 
         /// <summary>
         /// The Page service, used to set headers, activate features etc.
         /// </summary>
         public IPageService Page => _page.Get(GetService<IPageService>);
-        private readonly ValueGetOnce<IPageService> _page = new ValueGetOnce<IPageService>();
+        private readonly GetOnce<IPageService> _page = new GetOnce<IPageService>();
 
 
         /// <summary>
         /// The Render service, used to render one or more dynamic content within other content
         /// </summary>
         public IRenderService Render => _render.Get(GetService<IRenderService>);
-        private readonly ValueGetOnce<IRenderService> _render = new ValueGetOnce<IRenderService>();
+        private readonly GetOnce<IRenderService> _render = new GetOnce<IRenderService>();
 
         /// <summary>
         /// The Secure Data Service - mainly for reading / decrypting secrets. 
         /// </summary>
         public ISecureDataService SecureData => _secureData.Get(GetService<ISecureDataService>);
-        private readonly ValueGetOnce<ISecureDataService> _secureData = new ValueGetOnce<ISecureDataService>();
+        private readonly GetOnce<ISecureDataService> _secureData = new GetOnce<ISecureDataService>();
 
         /// <summary>
         /// The Razor-Blade Scrub service, used to clean up HTML.
         /// See [IScrub](xref:ToSic.Razor.Blade.IScrub)
         /// </summary>
         public IScrub Scrub => _scrub.Get(GetService<IScrub>);
-        private readonly ValueGetOnce<IScrub> _scrub = new ValueGetOnce<IScrub>();
+        private readonly GetOnce<IScrub> _scrub = new GetOnce<IScrub>();
 
 
         /// <summary>
         /// The toolbar service, used to generate advanced toolbars
         /// </summary>
         public IToolbarService Toolbar => _toolbar.Get(GetService<IToolbarService>);
-        private readonly ValueGetOnce<IToolbarService> _toolbar = new ValueGetOnce<IToolbarService>();
+        private readonly GetOnce<IToolbarService> _toolbar = new GetOnce<IToolbarService>();
     }
 
 }
diff --git a/Src/Sxc/ToSic.Sxc/Web/ContentSecurityPolicy/CspOfApp.cs b/Src/Sxc/ToSic.Sxc/Web/ContentSecurityPolicy/CspOfApp.cs
index 97a54d7db4..0166458a41 100644
--- a/Src/Sxc/ToSic.Sxc/Web/ContentSecurityPolicy/CspOfApp.cs
+++ b/Src/Sxc/ToSic.Sxc/Web/ContentSecurityPolicy/CspOfApp.cs
@@ -50,7 +50,7 @@ public void ConnectToRoot(IDynamicCodeRoot codeRoot)
         #region Read Settings
 
         public string AppPolicies => _appPolicies.Get(GetAppPolicies);
-        private readonly ValueGetOnce<string> _appPolicies = new ValueGetOnce<string>();
+        private readonly GetOnce<string> _appPolicies = new GetOnce<string>();
 
         private string GetAppPolicies()
         {
diff --git a/Src/Sxc/ToSic.Sxc/Web/ContentSecurityPolicy/CspOfModule.cs b/Src/Sxc/ToSic.Sxc/Web/ContentSecurityPolicy/CspOfModule.cs
index 8c33185ac1..7d45835e84 100644
--- a/Src/Sxc/ToSic.Sxc/Web/ContentSecurityPolicy/CspOfModule.cs
+++ b/Src/Sxc/ToSic.Sxc/Web/ContentSecurityPolicy/CspOfModule.cs
@@ -78,7 +78,7 @@ internal bool RegisterAppCsp(CspOfApp appCsp)
         #region Url Parameters to Detect Dev / True
 
         public bool UrlIsDevMode => _urlDevMode.Get(() => CspUrlParam.EqualsInsensitive(CspConstants.CspUrlDev));
-        private readonly ValueGetOnce<bool> _urlDevMode = new ValueGetOnce<bool>();
+        private readonly GetOnce<bool> _urlDevMode = new GetOnce<bool>();
 
         private string CspUrlParam => _cspUrlParam.Get(() =>
         {
@@ -89,7 +89,7 @@ internal bool RegisterAppCsp(CspOfApp appCsp)
             pageParameters.TryGetValue(CspConstants.CspUrlParameter, out var cspParam);
             return cspParam;
         }, Log, nameof(CspUrlParam));
-        private readonly ValueGetOnce<string> _cspUrlParam = new ValueGetOnce<string>();
+        private readonly GetOnce<string> _cspUrlParam = new GetOnce<string>();
 
         #endregion
 
@@ -103,7 +103,7 @@ internal bool RegisterAppCsp(CspOfApp appCsp)
             var pageSettings = CodeRootSettings()?.GetStack(PartSiteSystem, PartGlobalSystem, PartPresetSystem);
             return new CspSettingsReader(pageSettings, _user, UrlIsDevMode, Log);
         }, Log, nameof(SiteCspSettings));
-        private readonly ValueGetOnce<CspSettingsReader> _siteCspSettings = new ValueGetOnce<CspSettingsReader>();
+        private readonly GetOnce<CspSettingsReader> _siteCspSettings = new GetOnce<CspSettingsReader>();
 
         #endregion
 
@@ -113,7 +113,7 @@ internal bool RegisterAppCsp(CspOfApp appCsp)
         /// Enforce?
         /// </summary>
         internal bool IsEnforced => _cspReportOnly.Get(() => SiteCspSettings.IsEnforced, Log, nameof(IsEnforced));
-        private readonly ValueGetOnce<bool> _cspReportOnly = new ValueGetOnce<bool>();
+        private readonly GetOnce<bool> _cspReportOnly = new GetOnce<bool>();
 
 
         /// <summary>
@@ -134,7 +134,7 @@ internal bool RegisterAppCsp(CspOfApp appCsp)
             // Check URL Parameters - they are null if the feature is not enabled
             return CspUrlParam.EqualsInsensitive(CspConstants.CspUrlTrue) || UrlIsDevMode;
         }, Log, nameof(IsEnabled));
-        private readonly ValueGetOnce<bool> _enabled = new ValueGetOnce<bool>();
+        private readonly GetOnce<bool> _enabled = new GetOnce<bool>();
 
 
         #endregion
@@ -150,7 +150,7 @@ internal bool RegisterAppCsp(CspOfApp appCsp)
             Log.A($"Merged: {merged}");
             return new CspPolicyTextProcessor(Log).Parse(merged);
         }, Log, nameof(Policies));
-        private readonly ValueGetOnce<List<KeyValuePair<string, string>>> _policies = new ValueGetOnce<List<KeyValuePair<string, string>>>();
+        private readonly GetOnce<List<KeyValuePair<string, string>>> _policies = new GetOnce<List<KeyValuePair<string, string>>>();
 
         private string GetAppPolicies()
         {
diff --git a/Src/Sxc/ToSic.Sxc/Web/ContentSecurityPolicy/CspSettingsReader.cs b/Src/Sxc/ToSic.Sxc/Web/ContentSecurityPolicy/CspSettingsReader.cs
index 88606b80d1..19c426f25b 100644
--- a/Src/Sxc/ToSic.Sxc/Web/ContentSecurityPolicy/CspSettingsReader.cs
+++ b/Src/Sxc/ToSic.Sxc/Web/ContentSecurityPolicy/CspSettingsReader.cs
@@ -59,16 +59,16 @@ private object GetFromPreferredOrDefaultSource(string field)
             if (_user.IsAnonymous) return GetName("Anonymous");
             return ("none", null);
         }, Log, nameof(SettingPreferred));
-        private readonly ValueGetOnce<(string Name, DynamicEntity Settings)> _preferred = new ValueGetOnce<(string, DynamicEntity)>();
+        private readonly GetOnce<(string Name, DynamicEntity Settings)> _preferred = new GetOnce<(string, DynamicEntity)>();
 
         /// <summary>
         /// The fallback settings, which will be null if in devMode, because then we shouldn't do a fallback
         /// </summary>
         private DynamicEntity SettingsDefault => _devMode ? null : _default.Get(() => SettingsRoot?.Get("Default") as DynamicEntity);
-        private readonly ValueGetOnce<DynamicEntity> _default = new ValueGetOnce<DynamicEntity>();
+        private readonly GetOnce<DynamicEntity> _default = new GetOnce<DynamicEntity>();
 
         private DynamicEntity SettingsRoot => _settingsRoot.Get(() => _settingsOrNull?.Get(FieldCSPs) as DynamicEntity, Log, nameof(SettingsRoot));
-        private readonly ValueGetOnce<DynamicEntity> _settingsRoot = new ValueGetOnce<DynamicEntity>();
+        private readonly GetOnce<DynamicEntity> _settingsRoot = new GetOnce<DynamicEntity>();
 
     }
 }
diff --git a/Src/Sxc/ToSic.Sxc/Web/LightSpeed/LightSpeed.cs b/Src/Sxc/ToSic.Sxc/Web/LightSpeed/LightSpeed.cs
index 8cf8a8db85..6311c25d3b 100644
--- a/Src/Sxc/ToSic.Sxc/Web/LightSpeed/LightSpeed.cs
+++ b/Src/Sxc/ToSic.Sxc/Web/LightSpeed/LightSpeed.cs
@@ -119,7 +119,7 @@ private IList<string> AppPaths(List<AppState> appStates)
 
             return paths;
         }
-        private readonly ValueGetOnce<IList<string>> _appPaths = new ValueGetOnce<IList<string>>();
+        private readonly GetOnce<IList<string>> _appPaths = new GetOnce<IList<string>>();
 
         private int Duration => _duration.Get(() =>
         {
@@ -129,10 +129,10 @@ private IList<string> AppPaths(List<AppState> appStates)
             if (!user.IsAnonymous) return AppConfig.DurationUser;
             return AppConfig.Duration;
         });
-        private readonly ValueGetOnce<int> _duration = new ValueGetOnce<int>();
+        private readonly GetOnce<int> _duration = new GetOnce<int>();
 
         private string Suffix => _suffix.Get(GetSuffix);
-        private readonly ValueGetOnce<string> _suffix = new ValueGetOnce<string>();
+        private readonly GetOnce<string> _suffix = new GetOnce<string>();
 
         private string GetSuffix()
         {
@@ -144,16 +144,16 @@ private string GetSuffix()
         }
 
         private string CacheKey => _key.Get(() => Log.Return(() => Ocm.Id(_moduleId, _pageId, UserIdOrAnon, ViewKey, Suffix)));
-        private readonly ValueGetOnce<string> _key = new ValueGetOnce<string>();
+        private readonly GetOnce<string> _key = new GetOnce<string>();
 
         private int? UserIdOrAnon => _userId.Get(() => _block.Context.User.IsAnonymous ? (int?)null : _block.Context.User.Id);
-        private readonly ValueGetOnce<int?> _userId = new ValueGetOnce<int?>();
+        private readonly GetOnce<int?> _userId = new GetOnce<int?>();
 
         private string ViewKey => _viewKey.Get(() => _block.Configuration?.PreviewTemplateId.HasValue == true ? $"{_block.Configuration.AppId}:{_block.Configuration.View.Id}" : null);
-        private readonly ValueGetOnce<string> _viewKey = new ValueGetOnce<string>();
+        private readonly GetOnce<string> _viewKey = new GetOnce<string>();
 
         public OutputCacheItem Existing => _existing.Get(ExistingGenerator);
-        private readonly ValueGetOnce<OutputCacheItem> _existing = new ValueGetOnce<OutputCacheItem>();
+        private readonly GetOnce<OutputCacheItem> _existing = new GetOnce<OutputCacheItem>();
 
         private OutputCacheItem ExistingGenerator()
         {
@@ -175,7 +175,7 @@ private OutputCacheItem ExistingGenerator()
 
 
         public bool IsEnabled => _enabled.Get(IsEnabledGenerator);
-        private readonly ValueGetOnce<bool> _enabled = new ValueGetOnce<bool>();
+        private readonly GetOnce<bool> _enabled = new GetOnce<bool>();
 
         private bool IsEnabledGenerator()
         {
@@ -187,7 +187,7 @@ private bool IsEnabledGenerator()
         }
 
         public LightSpeedDecorator AppConfig => _lsd.Get(() => LightSpeedDecoratorGenerator(AppState));
-        private readonly ValueGetOnce<LightSpeedDecorator> _lsd = new ValueGetOnce<LightSpeedDecorator>();
+        private readonly GetOnce<LightSpeedDecorator> _lsd = new GetOnce<LightSpeedDecorator>();
 
         private LightSpeedDecorator LightSpeedDecoratorGenerator(AppState appState)
         {
diff --git a/Src/Sxc/ToSic.Sxc/Web/PageService/PageServiceShared.cs b/Src/Sxc/ToSic.Sxc/Web/PageService/PageServiceShared.cs
index 89a533a734..d6ae0c7e8c 100644
--- a/Src/Sxc/ToSic.Sxc/Web/PageService/PageServiceShared.cs
+++ b/Src/Sxc/ToSic.Sxc/Web/PageService/PageServiceShared.cs
@@ -25,7 +25,7 @@ public PageServiceShared(IPageFeatures pageFeatures, IFeaturesService featuresSe
         public CspOfModule Csp { get; }
 
         public string CspEphemeralMarker => _cspEphemeralMarker.Get(() => new Random().Next(100000000, 999999999).ToString());
-        private readonly ValueGetOnce<string> _cspEphemeralMarker = new ValueGetOnce<string>();
+        private readonly GetOnce<string> _cspEphemeralMarker = new GetOnce<string>();
 
 
         /// <summary>
diff --git a/Src/Sxc/ToSic.Sxc/Web/PageService/PageService_Features.cs b/Src/Sxc/ToSic.Sxc/Web/PageService/PageService_Features.cs
index 358550fc24..6353744d71 100644
--- a/Src/Sxc/ToSic.Sxc/Web/PageService/PageService_Features.cs
+++ b/Src/Sxc/ToSic.Sxc/Web/PageService/PageService_Features.cs
@@ -58,7 +58,7 @@ private string[] AddManualResources(string[] keys)
         }
 
         private DynamicEntity WebResources => _webResources.Get(() => (CodeRoot?.Settings as DynamicStack)?.Get(WebResourcesNode) as DynamicEntity);
-        private readonly ValueGetOnce<DynamicEntity> _webResources = new ValueGetOnce<DynamicEntity>();
+        private readonly GetOnce<DynamicEntity> _webResources = new GetOnce<DynamicEntity>();
         
     }
 }