diff --git a/src/Sentiment/Wikiled.Sentiment.Analysis/Containers/SentimentMainModule.cs b/src/Sentiment/Wikiled.Sentiment.Analysis/Containers/SentimentMainModule.cs
index 0f0078e..4be0650 100644
--- a/src/Sentiment/Wikiled.Sentiment.Analysis/Containers/SentimentMainModule.cs
+++ b/src/Sentiment/Wikiled.Sentiment.Analysis/Containers/SentimentMainModule.cs
@@ -41,7 +41,7 @@ public IServiceCollection ConfigureServices(IServiceCollection services)
             services.AddSingleton<ISentenceRepairHandler, SentenceRepairHandler>();
             services.AddSingleton<IExtendedWords, ExtendedWords>();
 
-            services.AddScoped<IMemoryCache>(c => new MemoryCache(new MemoryCacheOptions()));
+            services.AddSingleton<IMemoryCache>(c => new MemoryCache(new MemoryCacheOptions()));
 
             services.AddTransient<IWordFactory, WordOccurenceFactory>();
 
@@ -62,8 +62,8 @@ public IServiceCollection ConfigureServices(IServiceCollection services)
                     .AddFactory<ITextSplitter, ITextSplitter>();
 
             services.AddTransient<IProcessingPipeline, ProcessingPipeline>();
-            services.AddTransient<ITestingClient, TestingClient>();
-            services.AddTransient<ITrainingClient, TrainingClient>();
+            services.AddTransient<ITestingClient, TestingClient>().AddFactory<ITestingClient, TestingClient>();
+            services.AddTransient<ITrainingClient, TrainingClient>().AddFactory<ITestingClient, TestingClient>();
 
             services.AddScoped<SessionContext>().As<ISessionContext, SessionContext>();
             services.AddScoped<IContextWordsHandler, ContextWordsDataLoader>();