diff --git a/sol/sol_manager.cpp b/sol/sol_manager.cpp
index 3db7313..87f9ed7 100644
--- a/sol/sol_manager.cpp
+++ b/sol/sol_manager.cpp
@@ -113,8 +113,8 @@
     }
 
     // Create the SOL Context data for payload instance
-    auto context = std::make_unique<Context>(io, retryCount, sendThreshold,
-                                             payloadInstance, sessionID);
+    std::shared_ptr<Context> context = Context::makeContext(
+        io, retryCount, sendThreshold, payloadInstance, sessionID);
 
     payloadMap.emplace(payloadInstance, std::move(context));
 }