diff --git a/src/Function.FromCallback.cs b/src/Function.FromCallback.cs
index 03821e4..c45071c 100644
--- a/src/Function.FromCallback.cs
+++ b/src/Function.FromCallback.cs
@@ -39,10 +39,7 @@ public static Function FromCallback(Store store, Action callback)
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         callback(
                             );
 
@@ -104,10 +101,7 @@ public static Function FromCallback<T>(Store store, Action<T?> callback)
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         callback(
                             convT.Unbox(storeContext, store, args_and_results[0]));
 
@@ -170,10 +164,7 @@ public static Function FromCallback<T1, T2>(Store store, Action<T1?, T2?> callba
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]));
@@ -238,10 +229,7 @@ public static Function FromCallback<T1, T2, T3>(Store store, Action<T1?, T2?, T3
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -308,10 +296,7 @@ public static Function FromCallback<T1, T2, T3, T4>(Store store, Action<T1?, T2?
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -380,10 +365,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5>(Store store, Action<T1?,
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -454,10 +436,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, T6>(Store store, Action<
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -530,10 +509,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, T6, T7>(Store store, Act
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -608,10 +584,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, T6, T7, T8>(Store store,
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -688,10 +661,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, T6, T7, T8, T9>(Store st
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -770,10 +740,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(Sto
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -854,10 +821,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -940,10 +904,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -1016,10 +977,7 @@ public static Function FromCallback<TResult>(Store store, Func<TResult> callback
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             );
 
@@ -1083,10 +1041,7 @@ public static Function FromCallback<T, TResult>(Store store, Func<T?, TResult> c
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT.Unbox(storeContext, store, args_and_results[0]));
 
@@ -1151,10 +1106,7 @@ public static Function FromCallback<T1, T2, TResult>(Store store, Func<T1?, T2?,
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]));
@@ -1221,10 +1173,7 @@ public static Function FromCallback<T1, T2, T3, TResult>(Store store, Func<T1?,
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -1293,10 +1242,7 @@ public static Function FromCallback<T1, T2, T3, T4, TResult>(Store store, Func<T
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -1367,10 +1313,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, TResult>(Store store, Fu
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -1443,10 +1386,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, T6, TResult>(Store store
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -1521,10 +1461,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, T6, T7, TResult>(Store s
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -1601,10 +1538,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, T6, T7, T8, TResult>(Sto
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -1683,10 +1617,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, T6, T7, T8, T9, TResult>
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -1767,10 +1698,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, TRe
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -1853,10 +1781,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -1941,10 +1866,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -2019,10 +1941,7 @@ public static Function FromCallback<TResult1, TResult2>(Store store, Func<ValueT
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             );
 
@@ -2088,10 +2007,7 @@ public static Function FromCallback<T, TResult1, TResult2>(Store store, Func<T?,
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT.Unbox(storeContext, store, args_and_results[0]));
 
@@ -2158,10 +2074,7 @@ public static Function FromCallback<T1, T2, TResult1, TResult2>(Store store, Fun
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]));
@@ -2230,10 +2143,7 @@ public static Function FromCallback<T1, T2, T3, TResult1, TResult2>(Store store,
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -2304,10 +2214,7 @@ public static Function FromCallback<T1, T2, T3, T4, TResult1, TResult2>(Store st
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -2380,10 +2287,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, TResult1, TResult2>(Stor
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -2458,10 +2362,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, T6, TResult1, TResult2>(
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -2538,10 +2439,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, T6, T7, TResult1, TResul
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -2620,10 +2518,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, T6, T7, T8, TResult1, TR
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -2704,10 +2599,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, T6, T7, T8, T9, TResult1
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -2790,10 +2682,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, TRe
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -2878,10 +2767,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -2968,10 +2854,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -3048,10 +2931,7 @@ public static Function FromCallback<TResult1, TResult2, TResult3>(Store store, F
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             );
 
@@ -3119,10 +2999,7 @@ public static Function FromCallback<T, TResult1, TResult2, TResult3>(Store store
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT.Unbox(storeContext, store, args_and_results[0]));
 
@@ -3191,10 +3068,7 @@ public static Function FromCallback<T1, T2, TResult1, TResult2, TResult3>(Store
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]));
@@ -3265,10 +3139,7 @@ public static Function FromCallback<T1, T2, T3, TResult1, TResult2, TResult3>(St
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -3341,10 +3212,7 @@ public static Function FromCallback<T1, T2, T3, T4, TResult1, TResult2, TResult3
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -3419,10 +3287,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, TResult1, TResult2, TRes
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -3499,10 +3364,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, T6, TResult1, TResult2,
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -3581,10 +3443,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, T6, T7, TResult1, TResul
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -3665,10 +3524,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, T6, T7, T8, TResult1, TR
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -3751,10 +3607,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, T6, T7, T8, T9, TResult1
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -3839,10 +3692,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, TRe
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -3929,10 +3779,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -4021,10 +3868,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -4103,10 +3947,7 @@ public static Function FromCallback<TResult1, TResult2, TResult3, TResult4>(Stor
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             );
 
@@ -4176,10 +4017,7 @@ public static Function FromCallback<T, TResult1, TResult2, TResult3, TResult4>(S
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT.Unbox(storeContext, store, args_and_results[0]));
 
@@ -4250,10 +4088,7 @@ public static Function FromCallback<T1, T2, TResult1, TResult2, TResult3, TResul
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]));
@@ -4326,10 +4161,7 @@ public static Function FromCallback<T1, T2, T3, TResult1, TResult2, TResult3, TR
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -4404,10 +4236,7 @@ public static Function FromCallback<T1, T2, T3, T4, TResult1, TResult2, TResult3
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -4484,10 +4313,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, TResult1, TResult2, TRes
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -4566,10 +4392,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, T6, TResult1, TResult2,
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -4650,10 +4473,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, T6, T7, TResult1, TResul
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -4736,10 +4556,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, T6, T7, T8, TResult1, TR
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -4824,10 +4641,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, T6, T7, T8, T9, TResult1
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -4914,10 +4728,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, TRe
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -5006,10 +4817,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
@@ -5100,10 +4908,7 @@ public static Function FromCallback<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11
                 {
                     try
                     {
-                        var caller = new Caller(callerPtr);
-                        var storeContext = caller.context;
-                        var store = caller.store;
-
+                        var storeContext = store.Context;
                         var result = callback(
                             convT1.Unbox(storeContext, store, args_and_results[0]),
                             convT2.Unbox(storeContext, store, args_and_results[1]),
diff --git a/src/Function.FromCallback.tt b/src/Function.FromCallback.tt
index c5517ef..93b86fc 100644
--- a/src/Function.FromCallback.tt
+++ b/src/Function.FromCallback.tt
@@ -61,7 +61,7 @@ foreach (var (hasCaller, resultCount, parameterCount, methodGenerics, delegateTy
             {
                 Native.WasmtimeFuncUncheckedCallback func = (env, callerPtr, args_and_results, num_args_and_results) =>
                 {
-<# GenerateCallbackContent(hasCaller, resultCount, parameterCount); #>
+<# GenerateCallbackContent(hasCaller, resultCount, parameterCount, true); #>
                 };
 
                 var funcType = CreateFunctionType(parameterKinds, resultKinds);
diff --git a/src/FunctionCallbackOverloadTemplates.t4 b/src/FunctionCallbackOverloadTemplates.t4
index 3427ebf..eb42c62 100644
--- a/src/FunctionCallbackOverloadTemplates.t4
+++ b/src/FunctionCallbackOverloadTemplates.t4
@@ -4,14 +4,23 @@
 
 // Suppress the "not used" warning when this file is referenced but the function is not called.
 #pragma warning disable CS8321 // Local function is declared but never used
-void GenerateCallbackContent(bool hasCaller, int resultCount, int parameterCount) {
+void GenerateCallbackContent(bool hasCaller, int resultCount, int parameterCount, bool storeAvailable) {
 #pragma warning restore CS8321 // Local function is declared but never used
 #>
                     try
                     {
-                        var caller = new Caller(callerPtr);
+                        <# if (storeAvailable && !hasCaller)
+                        {
+                            #>var storeContext = store.Context;<#
+                        }
+                        else
+                        {
+                            #>var caller = new Caller(callerPtr);
                         var storeContext = caller.context;
                         var store = caller.store;
+<#
+                        }
+                        #>
 
                         <#= resultCount > 0 ? "var result = " : "" #>callback(
                             <#
diff --git a/src/Linker.DefineFunction.tt b/src/Linker.DefineFunction.tt
index d01a313..7ccc045 100644
--- a/src/Linker.DefineFunction.tt
+++ b/src/Linker.DefineFunction.tt
@@ -69,7 +69,7 @@ foreach (var (hasCaller, resultCount, parameterCount, methodGenerics, delegateTy
             {
                 Function.Native.WasmtimeFuncUncheckedCallback func = (env, callerPtr, args_and_results, num_args_and_results) =>
                 {
-<# GenerateCallbackContent(hasCaller, resultCount, parameterCount); #>
+<# GenerateCallbackContent(hasCaller, resultCount, parameterCount, false); #>
                 };
 
                 const int StackallocThreshold = 256;
diff --git a/src/Store.cs b/src/Store.cs
index 6378e6b..a119f1b 100644
--- a/src/Store.cs
+++ b/src/Store.cs
@@ -142,6 +142,8 @@ public Store(Engine engine, object? data)
             var storeHandle = GCHandle.Alloc(this, GCHandleType.Weak);
 
             handle = new Handle(Native.wasmtime_store_new(engine.NativeHandle, (IntPtr)storeHandle, Finalizer));
+
+            contextHandle = Native.wasmtime_store_context(NativeHandle);
         }
 
         /// <summary>
@@ -257,6 +259,25 @@ public void SetEpochDeadline(ulong ticksBeyondCurrent)
         /// </summary>
         public void SetData(object? data) => this.data = data;
 
+        /// <inheritdoc/>
+        public void Dispose()
+        {
+            handle.Dispose();
+        }
+
+        internal Handle NativeHandle
+        {
+            get
+            {
+                if (handle.IsInvalid)
+                {
+                    throw new ObjectDisposedException(typeof(Store).FullName);
+                }
+
+                return handle;
+            }
+        }
+
         /// <summary>
         /// Gets the context of the store.
         /// </summary>
@@ -267,24 +288,16 @@ public void SetEpochDeadline(ulong ticksBeyondCurrent)
         /// store handle in the GC finalizer thread while the <see cref="StoreContext"/> is still
         /// in use.
         /// </remarks>
-        internal StoreContext Context => new StoreContext(Native.wasmtime_store_context(NativeHandle));
-
-        /// <inheritdoc/>
-        public void Dispose()
-        {
-            handle.Dispose();
-        }
-
-        internal Handle NativeHandle
+        internal StoreContext Context
         {
             get
             {
-                if (handle.IsInvalid)
+                if (handle.IsClosed)
                 {
                     throw new ObjectDisposedException(typeof(Store).FullName);
                 }
 
-                return handle;
+                return new StoreContext(contextHandle);
             }
         }
 
@@ -320,6 +333,7 @@ private static class Native
             public static extern void wasmtime_store_limiter(Handle store, long memory_size, long table_elements, long instances, long tables, long memories);
         }
 
+        private readonly IntPtr contextHandle;
         private readonly Handle handle;
 
         private object? data;