diff --git a/NineChronicles.DataProvider.Executable/Program.cs b/NineChronicles.DataProvider.Executable/Program.cs
index 6332aa77..2fa22a04 100644
--- a/NineChronicles.DataProvider.Executable/Program.cs
+++ b/NineChronicles.DataProvider.Executable/Program.cs
@@ -232,7 +232,7 @@ IActionEvaluatorConfiguration GetActionEvaluatorConfiguration(IConfiguration con
                     RpcRemoteSever = false
                 },
                 new ConcurrentDictionary<string, Sentry.ITransaction>(),
-                new ArenaMemoryCache()
+                new StateMemoryCache()
             );
 
             if (headlessConfig.LogActionRenders)
@@ -250,7 +250,7 @@ IActionEvaluatorConfiguration GetActionEvaluatorConfiguration(IConfiguration con
             var stateContext = new StateContext(
                 context.BlockChain!.GetAccountState(context.BlockChain!.Tip.Hash),
                 context.BlockChain!.Tip.Index,
-                new ArenaMemoryCache()
+                new StateMemoryCache()
             );
 
             // ConfigureServices must come before Configure for now
diff --git a/NineChronicles.DataProvider.Tests/TestBase.cs b/NineChronicles.DataProvider.Tests/TestBase.cs
index 5c61ff3b..efd246ac 100644
--- a/NineChronicles.DataProvider.Tests/TestBase.cs
+++ b/NineChronicles.DataProvider.Tests/TestBase.cs
@@ -51,7 +51,7 @@ protected TestBase()
         {
             KeyStore = keyStore,
         };
-        var stateContext = new StateContext(GetMockState(), 0L, new ArenaMemoryCache());
+        var stateContext = new StateContext(GetMockState(), 0L, new StateMemoryCache());
         services
             .AddSingleton(standaloneContext)
             .AddSingleton(stateContext)
diff --git a/NineChronicles.DataProvider/GraphQLStartup.cs b/NineChronicles.DataProvider/GraphQLStartup.cs
index 50661c6b..fae9376e 100644
--- a/NineChronicles.DataProvider/GraphQLStartup.cs
+++ b/NineChronicles.DataProvider/GraphQLStartup.cs
@@ -44,7 +44,7 @@ public void ConfigureServices(IServiceCollection services)
                 .AddGraphTypes(typeof(StandaloneSchema))
                 .AddLibplanetExplorer()
                 .AddUserContextBuilder<UserContextBuilder>();
-            services.AddSingleton<ArenaMemoryCache>();
+            services.AddSingleton<StateMemoryCache>();
             services.AddGraphTypes();
             services.AddSingleton<NineChroniclesSummarySchema>();
             services.AddSingleton<StandaloneSchema>();
diff --git a/NineChronicles.Headless b/NineChronicles.Headless
index b9522002..78e9be3d 160000
--- a/NineChronicles.Headless
+++ b/NineChronicles.Headless
@@ -1 +1 @@
-Subproject commit b9522002b24635475fda4b19534e3c4a43dffc3b
+Subproject commit 78e9be3d0e4277ead502c0b523d223b0cda8f14a