diff --git a/src/Pure.DI.Core/Core/Code/BlockCodeBuilder.cs b/src/Pure.DI.Core/Core/Code/BlockCodeBuilder.cs
index e90ee8ca8..6387e59d1 100644
--- a/src/Pure.DI.Core/Core/Code/BlockCodeBuilder.cs
+++ b/src/Pure.DI.Core/Core/Code/BlockCodeBuilder.cs
@@ -130,30 +130,7 @@ variable.Node.Lifetime is Lifetime.Singleton or Lifetime.Scoped
         finally
         {
             info.HasCode = true;
-            if (block.Parent is not null
-                && info is { PerBlockRefCount: > 2, Code.Lines.Count: > 4 }) 
-            {
-                var localFunctionsCode = ctx.LocalFunctionsCode;
-                var localMethodName = $"{Names.LocalMethodPrefix}{variable.VariableName}{Names.EnsureExistsMethodNamePostfix}";
-                if (variable.Node.Binding.SemanticModel.Compilation.GetLanguageVersion() >= LanguageVersion.CSharp9)
-                {
-                    localFunctionsCode.AppendLine($"[{Names.MethodImplAttribute}(({Names.MethodImplOptions})0x300)]");
-                }
-                
-                localFunctionsCode.AppendLine($"void {localMethodName}()");
-                localFunctionsCode.AppendLine("{");
-                using (localFunctionsCode.Indent())
-                {
-                    localFunctionsCode.AppendLines(info.Code.Lines);
-                }
-                
-                localFunctionsCode.AppendLine("}");
-                ctx.Code.AppendLine($"{localMethodName}();");
-            }
-            else
-            {
-                ctx.Code.AppendLines(info.Code.Lines);
-            }
+            ctx.Code.AppendLines(info.Code.Lines);
         }
     }
     
diff --git a/src/Pure.DI.Core/Core/Code/VariablesBuilder.cs b/src/Pure.DI.Core/Core/Code/VariablesBuilder.cs
index 9c8ab4fca..a40e6f113 100644
--- a/src/Pure.DI.Core/Core/Code/VariablesBuilder.cs
+++ b/src/Pure.DI.Core/Core/Code/VariablesBuilder.cs
@@ -18,17 +18,14 @@ public Block Build(
         rootBlock.Statements.AddFirst(rootVar);
         var blocks = new Stack<Block>();
         blocks.Push(rootBlock);
+        var counter = 0;
         while (blocks.TryPop(out var currentBlock))
         {
-            if (cancellationToken.IsCancellationRequested)
-            {
-                break;
-            }
-
             var stack = new Stack<IStatement>(currentBlock.Statements);
             while (stack.TryPop(out var currentStatement))
             {
-                if (stack.Count > 0xffff)
+                cancellationToken.ThrowIfCancellationRequested();
+                if (counter++ > Const.MaxIterationsCount)
                 {
                     throw new CompileErrorException($"Cyclic dependency has been found.", rootNode.Binding.Source.GetLocation(), LogId.ErrorCyclicDependency);
                 }
diff --git a/src/Pure.DI.Core/Core/Const.cs b/src/Pure.DI.Core/Core/Const.cs
new file mode 100644
index 000000000..022c58964
--- /dev/null
+++ b/src/Pure.DI.Core/Core/Const.cs
@@ -0,0 +1,6 @@
+namespace Pure.DI.Core;
+
+public static class Const
+{
+    public const int MaxIterationsCount = 0xffff;
+}
\ No newline at end of file
diff --git a/src/Pure.DI.Core/Core/DependencyGraphBuilder.cs b/src/Pure.DI.Core/Core/DependencyGraphBuilder.cs
index 7ddefa6f9..8975492ce 100644
--- a/src/Pure.DI.Core/Core/DependencyGraphBuilder.cs
+++ b/src/Pure.DI.Core/Core/DependencyGraphBuilder.cs
@@ -28,6 +28,7 @@ public IEnumerable<DependencyNode> TryBuild(
         var roots = new List<DependencyNode>();
         foreach (var processingNode in nodes)
         {
+            cancellationToken.ThrowIfCancellationRequested();
             var node = processingNode.Node;
             if (node.Binding.Id > maxId)
             {
@@ -68,13 +69,19 @@ public IEnumerable<DependencyNode> TryBuild(
         var processed = new HashSet<ProcessingNode>();
         var notProcessed = new HashSet<ProcessingNode>();
         var edgesMap = new Dictionary<ProcessingNode, List<Dependency>>();
+        var counter = 0;
         while (queue.TryDequeue(out var node))
         {
+            cancellationToken.ThrowIfCancellationRequested();
+            if (counter++ > Const.MaxIterationsCount)
+            {
+                throw new CompileErrorException($"Cyclic dependency has been found.", setup.Source.GetLocation(), LogId.ErrorCyclicDependency);
+            }
+            
             var targetNode = node.Node;
             var isProcessed = true;
             foreach (var (injection, hasExplicitDefaultValue, explicitDefaultValue) in node.Injections)
             {
-                cancellationToken.ThrowIfCancellationRequested();
                 if (map.TryGetValue(injection, out var sourceNode))
                 {
                     if (!marker.IsMarkerBased(sourceNode.Type))