diff --git a/samples/RenderingPlayground/Program.cs b/samples/RenderingPlayground/Program.cs
index d22a52b788..8dbc429a87 100644
--- a/samples/RenderingPlayground/Program.cs
+++ b/samples/RenderingPlayground/Program.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
-using System.CommandLine.Invocation;
+using System.CommandLine;
 using System.CommandLine.IO;
 using System.CommandLine.Rendering;
 using System.CommandLine.Rendering.Views;
@@ -18,7 +18,7 @@ class Program
         /// <summary>
         /// Demonstrates various rendering capabilities.
         /// </summary>
-        /// <param name="invocationContext"></param>
+        /// <param name="parseResult"></param>
         /// <param name="sample">Renders a specified sample</param>
         /// <param name="height">The height of the rendering area</param>
         /// <param name="width">The width of the rendering area</param>
@@ -28,7 +28,7 @@ class Program
         /// <param name="overwrite">Overwrite the specified region. (If not, scroll.)</param>
         public static void Main(
 #pragma warning disable CS1573 // Parameter has no matching param tag in the XML comment (but other parameters do)
-            InvocationContext invocationContext,
+            ParseResult parseResult,
             SampleName sample = SampleName.Dir,
             int? height = null,
             int? width = null,
diff --git a/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.System_CommandLine_Hosting_api_is_not_changed.approved.txt b/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.System_CommandLine_Hosting_api_is_not_changed.approved.txt
index b6fc1b7f1a..d419f8902a 100644
--- a/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.System_CommandLine_Hosting_api_is_not_changed.approved.txt
+++ b/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.System_CommandLine_Hosting_api_is_not_changed.approved.txt
@@ -3,13 +3,13 @@ System.CommandLine.Hosting
     public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddCommandLineDirectives(this Microsoft.Extensions.Configuration.IConfigurationBuilder config, System.CommandLine.ParseResult commandline, System.CommandLine.Directive directive)
   public static class HostingExtensions
     public static OptionsBuilder<TOptions> BindCommandLine<TOptions>(this OptionsBuilder<TOptions> optionsBuilder)
-    public static Microsoft.Extensions.Hosting.IHost GetHost(this System.CommandLine.Invocation.InvocationContext invocationContext)
-    public static System.CommandLine.Invocation.InvocationContext GetInvocationContext(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder)
-    public static System.CommandLine.Invocation.InvocationContext GetInvocationContext(this Microsoft.Extensions.Hosting.HostBuilderContext context)
+    public static Microsoft.Extensions.Hosting.IHost GetHost(this System.CommandLine.ParseResult parseResult)
+    public static System.CommandLine.ParseResult GetParseResult(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder)
+    public static System.CommandLine.ParseResult GetParseResult(this Microsoft.Extensions.Hosting.HostBuilderContext context)
     public static System.CommandLine.Command UseCommandHandler<THandler>(this System.CommandLine.Command command)
     public static System.CommandLine.CommandLineConfiguration UseHost(this System.CommandLine.CommandLineConfiguration builder, System.Action<Microsoft.Extensions.Hosting.IHostBuilder> configureHost = null)
     public static System.CommandLine.CommandLineConfiguration UseHost(this System.CommandLine.CommandLineConfiguration builder, System.Func<System.String[],Microsoft.Extensions.Hosting.IHostBuilder> hostBuilderFactory, System.Action<Microsoft.Extensions.Hosting.IHostBuilder> configureHost = null)
-    public static Microsoft.Extensions.Hosting.IHostBuilder UseInvocationLifetime(this Microsoft.Extensions.Hosting.IHostBuilder host, System.CommandLine.Invocation.InvocationContext invocation, System.Action<InvocationLifetimeOptions> configureOptions = null)
+    public static Microsoft.Extensions.Hosting.IHostBuilder UseInvocationLifetime(this Microsoft.Extensions.Hosting.IHostBuilder host, System.Action<InvocationLifetimeOptions> configureOptions = null)
   public class InvocationLifetime, Microsoft.Extensions.Hosting.IHostLifetime
     .ctor(Microsoft.Extensions.Options.IOptions<InvocationLifetimeOptions> options, Microsoft.Extensions.Hosting.IHostEnvironment environment, Microsoft.Extensions.Hosting.IHostApplicationLifetime applicationLifetime, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory = null)
     public Microsoft.Extensions.Hosting.IHostApplicationLifetime ApplicationLifetime { get; }
diff --git a/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.System_CommandLine_NamingConventionBinder_api_is_not_changed.approved.txt b/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.System_CommandLine_NamingConventionBinder_api_is_not_changed.approved.txt
index 3967f7057a..acf1436179 100644
--- a/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.System_CommandLine_NamingConventionBinder_api_is_not_changed.approved.txt
+++ b/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.System_CommandLine_NamingConventionBinder_api_is_not_changed.approved.txt
@@ -14,10 +14,10 @@
 System.CommandLine.NamingConventionBinder
   public static class BindingContextExtensions
     public static System.Void AddModelBinder(this System.CommandLine.Binding.BindingContext bindingContext, ModelBinder binder)
-    public static System.CommandLine.Binding.BindingContext GetBindingContext(this System.CommandLine.Invocation.InvocationContext ctx)
+    public static System.CommandLine.Binding.BindingContext GetBindingContext(this System.CommandLine.ParseResult parseResult)
     public static ModelBinder GetOrCreateModelBinder(this System.CommandLine.Binding.BindingContext bindingContext, System.CommandLine.Binding.IValueDescriptor valueDescriptor)
   public abstract class BindingHandler : System.CommandLine.CliAction
-    public System.CommandLine.Binding.BindingContext GetBindingContext(System.CommandLine.Invocation.InvocationContext invocationContext)
+    public System.CommandLine.Binding.BindingContext GetBindingContext(System.CommandLine.ParseResult parseResult)
   public static class CommandHandler
     public static BindingHandler Create(System.Delegate delegate)
     public static BindingHandler Create<T>(Action<T> action)
@@ -114,8 +114,8 @@ System.CommandLine.NamingConventionBinder
   public class ModelBindingCommandHandler : BindingHandler
     public System.Void BindParameter(System.Reflection.ParameterInfo param, System.CommandLine.Argument argument)
     public System.Void BindParameter(System.Reflection.ParameterInfo param, System.CommandLine.Option option)
-    public System.Int32 Invoke(System.CommandLine.Invocation.InvocationContext context)
-    public System.Threading.Tasks.Task<System.Int32> InvokeAsync(System.CommandLine.Invocation.InvocationContext context, System.Threading.CancellationToken cancellationToken = null)
+    public System.Int32 Invoke(System.CommandLine.ParseResult parseResult)
+    public System.Threading.Tasks.Task<System.Int32> InvokeAsync(System.CommandLine.ParseResult parseResult, System.Threading.CancellationToken cancellationToken = null)
   public class ModelDescriptor
     public static ModelDescriptor FromType<T>()
     public static ModelDescriptor FromType(System.Type type)
diff --git a/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.System_CommandLine_api_is_not_changed.approved.txt b/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.System_CommandLine_api_is_not_changed.approved.txt
index 3345630a3b..f3df3f29d7 100644
--- a/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.System_CommandLine_api_is_not_changed.approved.txt
+++ b/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.System_CommandLine_api_is_not_changed.approved.txt
@@ -36,8 +36,8 @@ System.CommandLine
     public static Argument<System.IO.FileSystemInfo> AcceptExistingOnly(this Argument<System.IO.FileSystemInfo> argument)
     public static Argument<T> AcceptExistingOnly<T>(this Argument<T> argument)
   public abstract class CliAction
-    public System.Int32 Invoke(System.CommandLine.Invocation.InvocationContext context)
-    public System.Threading.Tasks.Task<System.Int32> InvokeAsync(System.CommandLine.Invocation.InvocationContext context, System.Threading.CancellationToken cancellationToken = null)
+    public System.Int32 Invoke(ParseResult parseResult)
+    public System.Threading.Tasks.Task<System.Int32> InvokeAsync(ParseResult parseResult, System.Threading.CancellationToken cancellationToken = null)
   public class Command : Symbol, System.Collections.Generic.IEnumerable<Symbol>, System.Collections.IEnumerable
     .ctor(System.String name, System.String description = null)
     public CliAction Action { get; set; }
@@ -53,10 +53,10 @@ System.CommandLine
     public System.Collections.Generic.IEnumerator<Symbol> GetEnumerator()
     public ParseResult Parse(System.Collections.Generic.IReadOnlyList<System.String> args, CommandLineConfiguration configuration = null)
     public ParseResult Parse(System.String commandLine, CommandLineConfiguration configuration = null)
-    public System.Void SetAction(System.Action<System.CommandLine.Invocation.InvocationContext> action)
-    public System.Void SetAction(System.Func<System.CommandLine.Invocation.InvocationContext,System.Int32> action)
-    public System.Void SetAction(System.Func<System.CommandLine.Invocation.InvocationContext,System.Threading.CancellationToken,System.Threading.Tasks.Task> action)
-    public System.Void SetAction(System.Func<System.CommandLine.Invocation.InvocationContext,System.Threading.CancellationToken,System.Threading.Tasks.Task<System.Int32>> action)
+    public System.Void SetAction(System.Action<ParseResult> action)
+    public System.Void SetAction(System.Func<ParseResult,System.Int32> action)
+    public System.Void SetAction(System.Func<ParseResult,System.Threading.CancellationToken,System.Threading.Tasks.Task> action)
+    public System.Void SetAction(System.Func<ParseResult,System.Threading.CancellationToken,System.Threading.Tasks.Task<System.Int32>> action)
   public class CommandLineConfiguration
     .ctor(Command rootCommand)
     public System.Collections.Generic.List<Directive> Directives { get; }
@@ -190,8 +190,8 @@ System.CommandLine.Help
   public class HelpAction : System.CommandLine.CliAction
     .ctor()
     public HelpBuilder Builder { get; set; }
-    public System.Int32 Invoke(System.CommandLine.Invocation.InvocationContext context)
-    public System.Threading.Tasks.Task<System.Int32> InvokeAsync(System.CommandLine.Invocation.InvocationContext context, System.Threading.CancellationToken cancellationToken = null)
+    public System.Int32 Invoke(System.CommandLine.ParseResult parseResult)
+    public System.Threading.Tasks.Task<System.Int32> InvokeAsync(System.CommandLine.ParseResult parseResult, System.Threading.CancellationToken cancellationToken = null)
   public class HelpBuilder
     .ctor(System.Int32 maxWidth = 2147483647)
     public System.Int32 MaxWidth { get; }
@@ -235,12 +235,6 @@ System.CommandLine.Help
     public System.Boolean Equals(System.Object obj)
     public System.Boolean Equals(TwoColumnHelpRow other)
     public System.Int32 GetHashCode()
-System.CommandLine.Invocation
-  public class InvocationContext
-    .ctor(System.CommandLine.ParseResult parseResult)
-    public System.CommandLine.ParseResult ParseResult { get; set; }
-    public T GetValue<T>(Option<T> option)
-    public T GetValue<T>(Argument<T> argument)
 System.CommandLine.Parsing
   public class ArgumentResult : SymbolResult
     public System.CommandLine.Argument Argument { get; }
diff --git a/src/System.CommandLine.Benchmarks/CommandLine/Perf_Parser_Simple.cs b/src/System.CommandLine.Benchmarks/CommandLine/Perf_Parser_Simple.cs
index f8ccc1a091..949e59933a 100644
--- a/src/System.CommandLine.Benchmarks/CommandLine/Perf_Parser_Simple.cs
+++ b/src/System.CommandLine.Benchmarks/CommandLine/Perf_Parser_Simple.cs
@@ -32,10 +32,10 @@ private static RootCommand BuildCommand()
                 stringOption
             };
 
-            command.SetAction(ctx => 
+            command.SetAction(parseResult => 
             {
-                bool boolean = ctx.ParseResult.GetValue(boolOption);
-                string text = ctx.ParseResult.GetValue(stringOption);
+                bool boolean = parseResult.GetValue(boolOption);
+                string text = parseResult.GetValue(stringOption);
             });
 
             return command;
diff --git a/src/System.CommandLine.Benchmarks/DragonFruit/Perf_CommandLine_Help.cs b/src/System.CommandLine.Benchmarks/DragonFruit/Perf_CommandLine_Help.cs
index 0ae076af5d..0723941cd5 100644
--- a/src/System.CommandLine.Benchmarks/DragonFruit/Perf_CommandLine_Help.cs
+++ b/src/System.CommandLine.Benchmarks/DragonFruit/Perf_CommandLine_Help.cs
@@ -30,7 +30,7 @@ public void Setup()
                 {
                     typeof(object).GetTypeInfo().Assembly.Location,
                     typeof(Enumerable).GetTypeInfo().Assembly.Location,
-                    typeof(System.CommandLine.Invocation.InvocationContext).GetTypeInfo().Assembly.Location
+                    typeof(System.CommandLine.ParseResult).GetTypeInfo().Assembly.Location
                 }
             );
             _testAssembly = Assembly.Load(File.ReadAllBytes(_testAssemblyFilePath));
diff --git a/src/System.CommandLine.Benchmarks/DragonFruit/Perf_XmlDocReader.cs b/src/System.CommandLine.Benchmarks/DragonFruit/Perf_XmlDocReader.cs
index 9bdfaa0f16..ffcd65615c 100644
--- a/src/System.CommandLine.Benchmarks/DragonFruit/Perf_XmlDocReader.cs
+++ b/src/System.CommandLine.Benchmarks/DragonFruit/Perf_XmlDocReader.cs
@@ -31,7 +31,7 @@ public Perf_XmlDocReader()
                 {
                     typeof(object).GetTypeInfo().Assembly.Location,
                     typeof(Enumerable).GetTypeInfo().Assembly.Location,
-                    typeof(System.CommandLine.Invocation.InvocationContext).GetTypeInfo().Assembly.Location
+                    typeof(ParseResult).GetTypeInfo().Assembly.Location
                 }
             );
 
diff --git a/src/System.CommandLine.Benchmarks/Input/Sample1.Main.cs b/src/System.CommandLine.Benchmarks/Input/Sample1.Main.cs
index c0a72bfb89..2fcfad415e 100644
--- a/src/System.CommandLine.Benchmarks/Input/Sample1.Main.cs
+++ b/src/System.CommandLine.Benchmarks/Input/Sample1.Main.cs
@@ -28,7 +28,7 @@ class Program
         /// <param name="overwrite">Overwrite the specified region. (If not, scroll.)</param>
         public static void Main(
 #pragma warning disable CS1573 // Parameter has no matching param tag in the XML comment (but other parameters do)
-            InvocationContext invocationContext,
+            ParseResult parseResult,
             SampleName sample = SampleName.Dir,
             int? height = null,
             int? width = null,
diff --git a/src/System.CommandLine.DragonFruit.Tests/CommandLineTests.cs b/src/System.CommandLine.DragonFruit.Tests/CommandLineTests.cs
index d49bd990b4..a2c1799c21 100644
--- a/src/System.CommandLine.DragonFruit.Tests/CommandLineTests.cs
+++ b/src/System.CommandLine.DragonFruit.Tests/CommandLineTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Rendering;
 using System.IO;
 using System.Threading.Tasks;
 using FluentAssertions;
diff --git a/src/System.CommandLine.DragonFruit.Tests/ConfigureFromMethodTests.cs b/src/System.CommandLine.DragonFruit.Tests/ConfigureFromMethodTests.cs
index 0e8cb5b840..d976a05e18 100644
--- a/src/System.CommandLine.DragonFruit.Tests/ConfigureFromMethodTests.cs
+++ b/src/System.CommandLine.DragonFruit.Tests/ConfigureFromMethodTests.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.CommandLine.Binding;
-using System.CommandLine.Invocation;
 using System.CommandLine.Tests.Binding;
 using System.CommandLine.Tests.Utility;
 using System.IO;
@@ -198,7 +197,6 @@ public async Task When_method_returns_Task_of_int_then_return_code_is_set_to_ret
         }
 
         [Theory]
-        [InlineData(typeof(InvocationContext))]
         [InlineData(typeof(BindingContext))]
         [InlineData(typeof(ParseResult))]
         [InlineData(typeof(CancellationToken))]
diff --git a/src/System.CommandLine.DragonFruit/CommandLine.cs b/src/System.CommandLine.DragonFruit/CommandLine.cs
index 78bb929397..01387118e8 100644
--- a/src/System.CommandLine.DragonFruit/CommandLine.cs
+++ b/src/System.CommandLine.DragonFruit/CommandLine.cs
@@ -3,8 +3,6 @@
 
 using System.Collections.Generic;
 using System.CommandLine.Binding;
-using System.CommandLine.Help;
-using System.CommandLine.Invocation;
 using System.CommandLine.NamingConventionBinder;
 using System.CommandLine.Utility;
 using System.IO;
@@ -251,7 +249,6 @@ public static IEnumerable<Option> BuildOptions(this MethodInfo method)
 
             var omittedTypes = new[]
                                {
-                                   typeof(InvocationContext),
                                    typeof(BindingContext),
                                    typeof(ParseResult),
                                    typeof(CommandLineConfiguration),
diff --git a/src/System.CommandLine.Generator.Tests/GeneratedCommandHandlerTests.cs b/src/System.CommandLine.Generator.Tests/GeneratedCommandHandlerTests.cs
index 3181131ae5..1b92774a6b 100644
--- a/src/System.CommandLine.Generator.Tests/GeneratedCommandHandlerTests.cs
+++ b/src/System.CommandLine.Generator.Tests/GeneratedCommandHandlerTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Invocation;
 using System.Threading.Tasks;
 using FluentAssertions;
 using Xunit;
@@ -118,24 +117,20 @@ int Execute(int first, int second)
         [Fact]
         public async Task Can_generate_handler_with_well_know_parameters_types()
         {
-            InvocationContext? boundInvocationContext = null;
             ParseResult? boundParseResult = null;
 
             void Execute(
-                InvocationContext invocationContext,
                 ParseResult parseResult)
             {
-                boundInvocationContext = invocationContext;
                 boundParseResult = parseResult;
             }
 
             var command = new Command("command");
 
-            command.SetHandler<Action<InvocationContext, ParseResult>>(Execute);
+            command.SetHandler<Action<ParseResult>>(Execute);
 
             await command.Parse("command").InvokeAsync();
 
-            boundInvocationContext.Should().NotBeNull();
             boundParseResult.Should().NotBeNull();
         }
 
diff --git a/src/System.CommandLine.Generator/CommandHandlerSourceGenerator.cs b/src/System.CommandLine.Generator/CommandHandlerSourceGenerator.cs
index d34e8e3328..9ae463b9de 100644
--- a/src/System.CommandLine.Generator/CommandHandlerSourceGenerator.cs
+++ b/src/System.CommandLine.Generator/CommandHandlerSourceGenerator.cs
@@ -115,10 +115,10 @@ private class GeneratedHandler_{handlerCount} : {CliActionType}
             }
 
             builder.Append($@"
-            public override int Invoke(global::System.CommandLine.Invocation.InvocationContext context) => InvokeAsync(context, global::System.Threading.CancellationToken.None).GetAwaiter().GetResult();");
+            public override int Invoke(global::System.CommandLine.ParseResult context) => InvokeAsync(context, global::System.Threading.CancellationToken.None).GetAwaiter().GetResult();");
 
             builder.Append($@"
-            public override async global::System.Threading.Tasks.Task<int> InvokeAsync(global::System.CommandLine.Invocation.InvocationContext context, global::System.Threading.CancellationToken cancellationToken)
+            public override async global::System.Threading.Tasks.Task<int> InvokeAsync(global::System.CommandLine.ParseResult context, global::System.Threading.CancellationToken cancellationToken)
             {{");
             builder.Append($@"
                 {invocation.InvokeContents()}");
diff --git a/src/System.CommandLine.Generator/Parameters/ArgumentParameter.cs b/src/System.CommandLine.Generator/Parameters/ArgumentParameter.cs
index 98172485a1..b1a2b4823c 100644
--- a/src/System.CommandLine.Generator/Parameters/ArgumentParameter.cs
+++ b/src/System.CommandLine.Generator/Parameters/ArgumentParameter.cs
@@ -10,7 +10,7 @@ public ArgumentParameter(string localName, INamedTypeSymbol type, ITypeSymbol va
         }
 
         public override string GetValueFromContext()
-            => $"context.ParseResult.GetValue({LocalName})";
+            => $"context.GetValue({LocalName})";
 
         public override int GetHashCode() 
             => base.GetHashCode();
diff --git a/src/System.CommandLine.Generator/Parameters/InvocationContextParameter.cs b/src/System.CommandLine.Generator/Parameters/InvocationContextParameter.cs
deleted file mode 100644
index 79f0f0bdca..0000000000
--- a/src/System.CommandLine.Generator/Parameters/InvocationContextParameter.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Microsoft.CodeAnalysis;
-
-namespace System.CommandLine.Generator.Parameters
-{
-    internal class InvocationContextParameter : Parameter, IEquatable<InvocationContextParameter>
-    {
-        public InvocationContextParameter(ITypeSymbol invocationContextType)
-            : base(invocationContextType)
-        {
-        }
-
-        public override string GetValueFromContext()
-            => "context";
-
-        public override int GetHashCode()
-            => base.GetHashCode();
-
-        public override bool Equals(object? obj)
-            => Equals(obj as InvocationContextParameter);
-
-        public bool Equals(InvocationContextParameter? other)
-        {
-            if (other is null) return false;
-            return base.Equals(other);
-        }
-    }
-}
diff --git a/src/System.CommandLine.Generator/Parameters/OptionParameter.cs b/src/System.CommandLine.Generator/Parameters/OptionParameter.cs
index 89667a38b1..b0c29c485a 100644
--- a/src/System.CommandLine.Generator/Parameters/OptionParameter.cs
+++ b/src/System.CommandLine.Generator/Parameters/OptionParameter.cs
@@ -11,7 +11,7 @@ public OptionParameter(string localName, INamedTypeSymbol type, ITypeSymbol valu
         }
 
         public override string GetValueFromContext()
-            => $"context.ParseResult.GetValue({LocalName})";
+            => $"context.GetValue({LocalName})";
 
         public override int GetHashCode()
             => base.GetHashCode();
diff --git a/src/System.CommandLine.Generator/Parameters/ParseResultParameter.cs b/src/System.CommandLine.Generator/Parameters/ParseResultParameter.cs
index 0847f3cdb4..52ed2cb5bb 100644
--- a/src/System.CommandLine.Generator/Parameters/ParseResultParameter.cs
+++ b/src/System.CommandLine.Generator/Parameters/ParseResultParameter.cs
@@ -10,7 +10,7 @@ public ParseResultParameter(ITypeSymbol parseResultType)
         }
 
         public override string GetValueFromContext()
-            => "context.ParseResult";
+            => "context";
 
         public override int GetHashCode()
             => base.GetHashCode();
diff --git a/src/System.CommandLine.Generator/WellKnownTypes.cs b/src/System.CommandLine.Generator/WellKnownTypes.cs
index e327d72e21..fe70110842 100644
--- a/src/System.CommandLine.Generator/WellKnownTypes.cs
+++ b/src/System.CommandLine.Generator/WellKnownTypes.cs
@@ -10,13 +10,11 @@ namespace System.CommandLine.Generator
     internal class WellKnownTypes
     {
         public INamedTypeSymbol ParseResult { get; }
-        public INamedTypeSymbol InvocationContext { get; }
         public IEqualityComparer<ISymbol?> Comparer { get; }
 
         public WellKnownTypes(Compilation compilation, IEqualityComparer<ISymbol?> comparer)
         {
             ParseResult = GetType("System.CommandLine.ParseResult");
-            InvocationContext = GetType("System.CommandLine.Invocation.InvocationContext");
 
             INamedTypeSymbol GetType(string typeName)
                 => compilation.GetTypeByMetadataName(typeName)
@@ -29,12 +27,6 @@ INamedTypeSymbol GetType(string typeName)
 
         internal bool TryGet(ISymbol symbol, out Parameter? parameter)
         {
-            if (Comparer.Equals(InvocationContext, symbol))
-            {
-                parameter = new InvocationContextParameter(InvocationContext);
-                return true;
-            }
-
             if (Comparer.Equals(ParseResult, symbol))
             {
                 parameter = new ParseResultParameter(ParseResult);
diff --git a/src/System.CommandLine.Hosting.Tests/HostingHandlerTest.cs b/src/System.CommandLine.Hosting.Tests/HostingHandlerTest.cs
index 99ce79a5e1..b21bf35c17 100644
--- a/src/System.CommandLine.Hosting.Tests/HostingHandlerTest.cs
+++ b/src/System.CommandLine.Hosting.Tests/HostingHandlerTest.cs
@@ -1,7 +1,4 @@
-using System.CommandLine;
-using System.CommandLine.Invocation;
-using System.CommandLine.Parsing;
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
 using FluentAssertions;
 using Microsoft.Extensions.DependencyInjection;
@@ -125,12 +122,12 @@ public abstract class MyBaseHandler : CliAction
         {
             public int IntOption { get; set; } // bound from option
 
-            public override int Invoke(InvocationContext context)
+            public override int Invoke(ParseResult context)
             {
                 return Act();
             }
 
-            public override Task<int> InvokeAsync(InvocationContext context, CancellationToken cancellationToken)
+            public override Task<int> InvokeAsync(ParseResult context, CancellationToken cancellationToken)
             {
                 return Task.FromResult(Act());
             }
@@ -156,13 +153,13 @@ public MyHandler(MyService service)
 
                 public int IntOption { get; set; } // bound from option
 
-                public override int Invoke(InvocationContext context)
+                public override int Invoke(ParseResult context)
                 {
                     service.Value = IntOption;
                     return IntOption;
                 }
 
-                public override Task<int> InvokeAsync(InvocationContext context, CancellationToken cancellationToken)
+                public override Task<int> InvokeAsync(ParseResult context, CancellationToken cancellationToken)
                 {
                     service.Value = IntOption;
                     return Task.FromResult(IntOption);
@@ -207,9 +204,9 @@ public MyHandler(MyService service)
 
                 public string One { get; set; }
 
-                public override int Invoke(InvocationContext context) => InvokeAsync(context, CancellationToken.None).GetAwaiter().GetResult();
+                public override int Invoke(ParseResult context) => InvokeAsync(context, CancellationToken.None).GetAwaiter().GetResult();
 
-                public override Task<int> InvokeAsync(InvocationContext context, CancellationToken cancellationToken)
+                public override Task<int> InvokeAsync(ParseResult context, CancellationToken cancellationToken)
                 {
                     service.Value = IntOption;
                     service.StringValue = One;
diff --git a/src/System.CommandLine.Hosting.Tests/HostingTests.cs b/src/System.CommandLine.Hosting.Tests/HostingTests.cs
index a67f319857..26a0771b40 100644
--- a/src/System.CommandLine.Hosting.Tests/HostingTests.cs
+++ b/src/System.CommandLine.Hosting.Tests/HostingTests.cs
@@ -1,6 +1,4 @@
 using System.CommandLine.Binding;
-using System.CommandLine.Invocation;
-using System.CommandLine.Parsing;
 using System.Linq;
 using CommandHandler = System.CommandLine.NamingConventionBinder.CommandHandler;
 
@@ -39,33 +37,31 @@ void Execute(IHost host)
         }
 
         [Fact]
-        public async static Task UseHost_adds_invocation_context_to_HostBuilder_Properties()
+        public async static Task UseHost_adds_ParseResult_to_HostBuilder_Properties()
         {
-            InvocationContext invocationContext = null;
+            ParseResult parseResult = null;
 
             var config = new CommandLineConfiguration(new RootCommand())
                 .UseHost(host =>
                 {
-                    if (host.Properties.TryGetValue(typeof(InvocationContext), out var ctx))
-                        invocationContext = ctx as InvocationContext;
+                    if (host.Properties.TryGetValue(typeof(ParseResult), out var ctx))
+                        parseResult = ctx as ParseResult;
                 });
 
             await config.InvokeAsync(Array.Empty<string>());
 
-            invocationContext.Should().NotBeNull();
+            parseResult.Should().NotBeNull();
         }
 
         [Fact]
-        public async static Task UseHost_adds_invocation_context_to_Host_Services()
+        public async static Task UseHost_adds_ParseResult_to_Host_Services()
         {
-            InvocationContext invocationContext = null;
             BindingContext bindingContext = null;
             ParseResult parseResult = null;
 
             void Execute(IHost host)
             {
                 var services = host.Services;
-                invocationContext = services.GetRequiredService<InvocationContext>();
                 bindingContext = services.GetRequiredService<BindingContext>();
                 parseResult = services.GetRequiredService<ParseResult>();
             }
@@ -77,7 +73,6 @@ void Execute(IHost host)
 
             await config.InvokeAsync(Array.Empty<string>());
 
-            invocationContext.Should().NotBeNull();
             bindingContext.Should().NotBeNull();
             parseResult.Should().NotBeNull();
         }
@@ -104,8 +99,8 @@ void Execute(IHost host)
                 })
                 .UseHost(host =>
                 {
-                    var invocation = (InvocationContext)host.Properties[typeof(InvocationContext)];
-                    var args = invocation.ParseResult.UnmatchedTokens.ToArray();
+                    var parseResult = (ParseResult)host.Properties[typeof(ParseResult)];
+                    var args = parseResult.UnmatchedTokens.ToArray();
                     host.ConfigureHostConfiguration(config =>
                     {
                         config.AddCommandLine(args);
@@ -243,13 +238,13 @@ public void SubCommand(int myArgument)
         }
 
         [Fact]
-        public async static Task GetInvocationContext_returns_non_null_instance()
+        public async static Task GetParseResult_returns_non_null_instance()
         {
             bool ctxAsserted = false;
             var config = new CommandLineConfiguration(new RootCommand())
                 .UseHost(hostBuilder =>
                 {
-                    InvocationContext ctx = hostBuilder.GetInvocationContext();
+                    ParseResult ctx = hostBuilder.GetParseResult();
                     ctx.Should().NotBeNull();
                     ctxAsserted = true;
                 });
@@ -259,7 +254,7 @@ public async static Task GetInvocationContext_returns_non_null_instance()
         }
 
         [Fact]
-        public async static Task GetInvocationContext_in_ConfigureServices_returns_non_null_instance()
+        public async static Task GetParseResult_in_ConfigureServices_returns_non_null_instance()
         {
             bool ctxAsserted = false;
             var config = new CommandLineConfiguration(new RootCommand())
@@ -267,7 +262,7 @@ public async static Task GetInvocationContext_in_ConfigureServices_returns_non_n
                 {
                     hostBuilder.ConfigureServices((hostingCtx, services) =>
                     {
-                        InvocationContext invocationCtx = hostingCtx.GetInvocationContext();
+                        ParseResult invocationCtx = hostingCtx.GetParseResult();
                         invocationCtx.Should().NotBeNull();
                         ctxAsserted = true;
                     });
@@ -283,7 +278,7 @@ public static void GetInvocationContext_throws_if_not_within_invocation()
             var hostBuilder = new HostBuilder();
             hostBuilder.Invoking(b =>
             {
-                _ = b.GetInvocationContext();
+                _ = b.GetParseResult();
             })
                 .Should().Throw<InvalidOperationException>();
         }
@@ -295,7 +290,7 @@ public static void GetInvocationContext_in_ConfigureServices_throws_if_not_withi
             {
                 b.ConfigureServices((hostingCtx, services) =>
                 {
-                    _ = hostingCtx.GetInvocationContext();
+                    _ = hostingCtx.GetParseResult();
                 });
                 _ = b.Build();
             })
diff --git a/src/System.CommandLine.Hosting/HostingAction.cs b/src/System.CommandLine.Hosting/HostingAction.cs
index dc58396ab9..75cb580904 100644
--- a/src/System.CommandLine.Hosting/HostingAction.cs
+++ b/src/System.CommandLine.Hosting/HostingAction.cs
@@ -1,6 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using System.CommandLine.Invocation;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -34,31 +33,30 @@ private HostingAction(Func<string[], IHostBuilder> hostBuilderFactory, Action<IH
             _actualAction = actualAction;
         }
 
-        public override BindingContext GetBindingContext(InvocationContext invocationContext) 
+        public override BindingContext GetBindingContext(ParseResult parseResult) 
             => _actualAction is BindingHandler bindingHandler
-                ? bindingHandler.GetBindingContext(invocationContext)
-                : base.GetBindingContext(invocationContext);
+                ? bindingHandler.GetBindingContext(parseResult)
+                : base.GetBindingContext(parseResult);
 
-        public async override Task<int> InvokeAsync(InvocationContext invocation, CancellationToken cancellationToken = default)
+        public async override Task<int> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken = default)
         {
-            var argsRemaining = invocation.ParseResult.UnmatchedTokens;
+            var argsRemaining = parseResult.UnmatchedTokens;
             var hostBuilder = _hostBuilderFactory?.Invoke(argsRemaining)
                 ?? new HostBuilder();
-            hostBuilder.Properties[typeof(InvocationContext)] = invocation;
+            hostBuilder.Properties[typeof(ParseResult)] = parseResult;
 
-            Directive configurationDirective = invocation.ParseResult.Configuration.Directives.Single(d => d.Name == "config");
+            Directive configurationDirective = parseResult.Configuration.Directives.Single(d => d.Name == "config");
             hostBuilder.ConfigureHostConfiguration(config =>
             {
-                config.AddCommandLineDirectives(invocation.ParseResult, configurationDirective);
+                config.AddCommandLineDirectives(parseResult, configurationDirective);
             });
-            var bindingContext = GetBindingContext(invocation);
+            var bindingContext = GetBindingContext(parseResult);
             int registeredBefore = 0;
-            hostBuilder.UseInvocationLifetime(invocation);
+            hostBuilder.UseInvocationLifetime();
             hostBuilder.ConfigureServices(services =>
             {
-                services.AddSingleton(invocation);
+                services.AddSingleton(parseResult);
                 services.AddSingleton(bindingContext);
-                services.AddTransient(_ => invocation.ParseResult);
 
                 registeredBefore = services.Count;
             });
@@ -88,7 +86,7 @@ public async override Task<int> InvokeAsync(InvocationContext invocation, Cancel
             {
                 if (_actualAction is not null)
                 {
-                    return await _actualAction.InvokeAsync(invocation, cancellationToken);
+                    return await _actualAction.InvokeAsync(parseResult, cancellationToken);
                 }
                 return 0;
             }
@@ -98,6 +96,6 @@ public async override Task<int> InvokeAsync(InvocationContext invocation, Cancel
             }
         }
 
-        public override int Invoke(InvocationContext context) => InvokeAsync(context).GetAwaiter().GetResult();
+        public override int Invoke(ParseResult parseResult) => InvokeAsync(parseResult).GetAwaiter().GetResult();
     }
 }
diff --git a/src/System.CommandLine.Hosting/HostingExtensions.cs b/src/System.CommandLine.Hosting/HostingExtensions.cs
index 6938873f2d..50fa4dc29f 100644
--- a/src/System.CommandLine.Hosting/HostingExtensions.cs
+++ b/src/System.CommandLine.Hosting/HostingExtensions.cs
@@ -1,13 +1,10 @@
 using System.CommandLine.Binding;
-using System.CommandLine.Invocation;
 using System.CommandLine.NamingConventionBinder;
 using CommandHandler = System.CommandLine.NamingConventionBinder.CommandHandler;
 
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
-using System.CommandLine.Help;
 
 namespace System.CommandLine.Hosting
 {
@@ -28,12 +25,10 @@ public static CommandLineConfiguration UseHost(this CommandLineConfiguration bui
             Action<IHostBuilder> configureHost = null
             ) => UseHost(builder, null, configureHost);
 
-        public static IHostBuilder UseInvocationLifetime(this IHostBuilder host,
-            InvocationContext invocation, Action<InvocationLifetimeOptions> configureOptions = null)
+        public static IHostBuilder UseInvocationLifetime(this IHostBuilder host, Action<InvocationLifetimeOptions> configureOptions = null)
         {
             return host.ConfigureServices(services =>
             {
-                services.TryAddSingleton(invocation);
                 services.AddSingleton<IHostLifetime, InvocationLifetime>();
                 if (configureOptions is Action<InvocationLifetimeOptions>)
                     services.Configure(configureOptions);
@@ -64,33 +59,33 @@ public static Command UseCommandHandler<THandler>(this Command command)
             return command;
         }
 
-        public static InvocationContext GetInvocationContext(this IHostBuilder hostBuilder)
+        public static ParseResult GetParseResult(this IHostBuilder hostBuilder)
         {
             _ = hostBuilder ?? throw new ArgumentNullException(nameof(hostBuilder));
 
-            if (hostBuilder.Properties.TryGetValue(typeof(InvocationContext), out var ctxObj) &&
-                ctxObj is InvocationContext invocationContext)
+            if (hostBuilder.Properties.TryGetValue(typeof(ParseResult), out var ctxObj) &&
+                ctxObj is ParseResult invocationContext)
                 return invocationContext;
 
             throw new InvalidOperationException("Host builder has no Invocation Context registered to it.");
         }
 
-        public static InvocationContext GetInvocationContext(this HostBuilderContext context)
+        public static ParseResult GetParseResult(this HostBuilderContext context)
         {
             _ = context ?? throw new ArgumentNullException(nameof(context));
 
-            if (context.Properties.TryGetValue(typeof(InvocationContext), out var ctxObj) &&
-                ctxObj is InvocationContext invocationContext)
+            if (context.Properties.TryGetValue(typeof(ParseResult), out var ctxObj) &&
+                ctxObj is ParseResult invocationContext)
                 return invocationContext;
 
             throw new InvalidOperationException("Host builder has no Invocation Context registered to it.");
         }
 
-        public static IHost GetHost(this InvocationContext invocationContext)
+        public static IHost GetHost(this ParseResult parseResult)
         {
-            _ = invocationContext ?? throw new ArgumentNullException(paramName: nameof(invocationContext));
+            _ = parseResult ?? throw new ArgumentNullException(paramName: nameof(parseResult));
             var hostModelBinder = new ModelBinder<IHost>();
-            return (IHost)hostModelBinder.CreateInstance(invocationContext.GetBindingContext());
+            return (IHost)hostModelBinder.CreateInstance(parseResult.GetBindingContext());
         }
     }
 }
diff --git a/src/System.CommandLine.NamingConventionBinder.Tests/ModelBinderTests.cs b/src/System.CommandLine.NamingConventionBinder.Tests/ModelBinderTests.cs
index 69341f01b3..5227b54be1 100644
--- a/src/System.CommandLine.NamingConventionBinder.Tests/ModelBinderTests.cs
+++ b/src/System.CommandLine.NamingConventionBinder.Tests/ModelBinderTests.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections.Generic;
-using System.CommandLine.Invocation;
 using System.CommandLine.Parsing;
 using System.CommandLine.Tests.Binding;
 using System.CommandLine.Utility;
@@ -33,7 +32,7 @@ public void Option_arguments_are_bound_by_name_to_constructor_parameters(
             OptionBuilder.CreateOption("--value", type)
         };
 
-        var bindingContext = new InvocationContext(command.Parse(commandLine)).GetBindingContext();
+        var bindingContext = command.Parse(commandLine).GetBindingContext();
 
         var instance = binder.CreateInstance(bindingContext);
 
@@ -60,7 +59,7 @@ public void Command_arguments_are_bound_by_name_to_constructor_parameters(
             ArgumentBuilder.CreateArgument(type)
         };
 
-        var bindingContext = new InvocationContext(command.Parse(commandLine)).GetBindingContext();
+        var bindingContext = command.Parse(commandLine).GetBindingContext();
 
         var instance = binder.CreateInstance(bindingContext);
 
@@ -83,7 +82,7 @@ public void Command_arguments_are_bound_by_name_to_complex_constructor_parameter
             ArgumentBuilder.CreateArgument(type)
         };
 
-        var bindingContext = new InvocationContext(command.Parse(commandLine)).GetBindingContext();
+        var bindingContext = command.Parse(commandLine).GetBindingContext();
 
         var instance = binder.CreateInstance(bindingContext);
 
@@ -107,7 +106,7 @@ public void Explicitly_configured_default_values_can_be_bound_by_name_to_constru
         command.Options.Add(option);
         var binder = new ModelBinder(typeof(ClassWithMultiLetterCtorParameters));
 
-        var bindingContext = new InvocationContext(Parser.Parse(command, "")).GetBindingContext();
+        var bindingContext = Parser.Parse(command, "").GetBindingContext();
 
         var instance = (ClassWithMultiLetterCtorParameters)binder.CreateInstance(bindingContext);
 
@@ -132,7 +131,7 @@ public void Option_arguments_are_bound_by_name_to_property_setters(
             OptionBuilder.CreateOption("--value", type)
         };
 
-        var bindingContext = new InvocationContext(command.Parse(commandLine)).GetBindingContext();
+        var bindingContext = command.Parse(commandLine).GetBindingContext();
 
         var instance = binder.CreateInstance(bindingContext);
 
@@ -159,7 +158,7 @@ public void Command_arguments_are_bound_by_name_to_property_setters(
             ArgumentBuilder.CreateArgument(type)
         };
 
-        var bindingContext = new InvocationContext(command.Parse(commandLine)).GetBindingContext();
+        var bindingContext = command.Parse(commandLine).GetBindingContext();
 
         var instance = binder.CreateInstance(bindingContext);
 
@@ -178,7 +177,7 @@ public void Types_having_constructors_accepting_a_single_string_are_bound_using_
         var command = new Command("the-command");
         command.Options.Add(option);
         var binder = new ModelBinder(typeof(ClassWithCtorParameter<DirectoryInfo>));
-        var bindingContext = new InvocationContext(command.Parse($"--value \"{tempPath}\"")).GetBindingContext();
+        var bindingContext = command.Parse($"--value \"{tempPath}\"").GetBindingContext();
 
         var instance = (ClassWithCtorParameter<DirectoryInfo>)binder.CreateInstance(bindingContext);
 
@@ -194,7 +193,7 @@ public void Explicitly_configured_default_values_can_be_bound_by_name_to_propert
         command.Options.Add(option);
         var binder = new ModelBinder(typeof(ClassWithSetter<string>));
 
-        var bindingContext = new InvocationContext(command.Parse("")).GetBindingContext();
+        var bindingContext = command.Parse("").GetBindingContext();
 
         var instance = (ClassWithSetter<string>)binder.CreateInstance(bindingContext);
 
@@ -211,8 +210,7 @@ public void Property_setters_with_no_default_value_and_no_matching_option_are_no
 
         var binder = new ModelBinder(typeof(ClassWithSettersAndCtorParametersWithDifferentNames));
 
-        var bindingContext = new InvocationContext(
-            command.Parse("")).GetBindingContext();
+        var bindingContext = command.Parse("").GetBindingContext();
 
         var instance = (ClassWithSettersAndCtorParametersWithDifferentNames)binder.CreateInstance(bindingContext);
 
@@ -226,7 +224,7 @@ public void Parse_result_can_be_used_to_create_an_instance_without_doing_handler
         {
             new Option<int>("--int-option")
         };
-        var bindingContext = new InvocationContext(command.Parse("the-command --int-option 123")).GetBindingContext();
+        var bindingContext = command.Parse("the-command --int-option 123").GetBindingContext();
         var binder = new ModelBinder(typeof(ClassWithMultiLetterSetters));
 
         var instance = (ClassWithMultiLetterSetters)binder.CreateInstance(bindingContext);
@@ -242,7 +240,7 @@ public void Parse_result_can_be_used_to_modify_an_existing_instance_without_doin
             new Option<int>("--int-option")
         };
         var instance = new ClassWithMultiLetterSetters();
-        var bindingContext = new InvocationContext(command.Parse("the-command --int-option 123")).GetBindingContext();
+        var bindingContext = command.Parse("the-command --int-option 123").GetBindingContext();
         var binder = new ModelBinder(typeof(ClassWithMultiLetterSetters));
 
         binder.UpdateInstance(instance, bindingContext);
@@ -256,7 +254,7 @@ public void Modify_an_existing_instance_should_keep_all_default_values_if_no_arg
         Command parser = new ("the-command");
 
         var instance = new ClassWithComplexTypes();
-        var bindingContext = new InvocationContext(parser.Parse("the-command")).GetBindingContext();
+        var bindingContext = parser.Parse("the-command").GetBindingContext();
         var binder = new ModelBinder(typeof(ClassWithComplexTypes));
 
         binder.UpdateInstance(instance, bindingContext);
@@ -277,7 +275,7 @@ public void Values_from_options_on_parent_commands_are_bound_by_name_by_default(
 
         var parseResult = parentCommand.Parse("parent-command --int-option 123 child-command");
 
-        var bindingContext = new InvocationContext(parseResult).GetBindingContext();
+        var bindingContext = parseResult.GetBindingContext();
 
         var instance = (ClassWithMultiLetterSetters)binder.CreateInstance(bindingContext);
 
@@ -300,7 +298,7 @@ public void Default_values_from_options_on_parent_commands_are_bound_by_name_by_
 
         var parseResult = parentCommand.Parse("parent-command child-command");
 
-        var bindingContext = new InvocationContext(parseResult).GetBindingContext();
+        var bindingContext = parseResult.GetBindingContext();
 
         var instance = (ClassWithMultiLetterSetters)binder.CreateInstance(bindingContext);
 
@@ -320,7 +318,7 @@ public void Values_from_parent_command_arguments_are_bound_by_name_by_default()
 
         var parseResult = parentCommand.Parse("parent-command 123 child-command");
 
-        var bindingContext = new InvocationContext(parseResult).GetBindingContext();
+        var bindingContext = parseResult.GetBindingContext();
 
         var instance = (ClassWithMultiLetterSetters)binder.CreateInstance(bindingContext);
 
@@ -343,7 +341,7 @@ public void Default_values_from_parent_command_arguments_are_bound_by_name_by_de
 
         var parseResult = parentCommand.Parse("parent-command child-command");
 
-        var bindingContext = new InvocationContext(parseResult).GetBindingContext();
+        var bindingContext = parseResult.GetBindingContext();
 
         var instance = (ClassWithMultiLetterSetters)binder.CreateInstance(bindingContext);
 
@@ -367,7 +365,7 @@ public void Values_from_options_on_parent_commands_can_be_bound_regardless_of_na
             c => c.IntOption,
             option);
 
-        var bindingContext = new InvocationContext(parentCommand.Parse("parent-command -x 123 child-command")).GetBindingContext();
+        var bindingContext = parentCommand.Parse("parent-command -x 123 child-command").GetBindingContext();
 
         var instance = (ClassWithMultiLetterSetters)binder.CreateInstance(bindingContext);
 
@@ -385,7 +383,7 @@ public void Arbitrary_values_can_be_bound()
             c => c.IntOption,
             _ => 123);
 
-        var bindingContext = new InvocationContext(command.Parse("the-command")).GetBindingContext();
+        var bindingContext = command.Parse("the-command").GetBindingContext();
 
         var instance = (ClassWithMultiLetterSetters)binder.CreateInstance(bindingContext);
 
@@ -407,7 +405,7 @@ public void PropertyInfo_can_be_bound_to_option()
             propertyInfo,
             option);
 
-        var bindingContext = new InvocationContext(command.Parse("the-command --fred 42")).GetBindingContext();
+        var bindingContext = command.Parse("the-command --fred 42").GetBindingContext();
 
         var instance = (ClassWithMultiLetterSetters)binder.CreateInstance(bindingContext);
 
@@ -427,7 +425,7 @@ public void PropertyInfo_can_be_bound_to_argument()
 
         binder.BindMemberFromValue(propertyInfo, argument);
 
-        var bindingContext = new InvocationContext(command.Parse("the-command 42")).GetBindingContext();
+        var bindingContext = command.Parse("the-command 42").GetBindingContext();
 
         var instance = (ClassWithMultiLetterSetters)binder.CreateInstance(bindingContext);
 
@@ -447,7 +445,7 @@ public void PropertyExpression_can_be_bound_to_option()
             i => i.IntOption,
             option);
 
-        var bindingContext = new InvocationContext(command.Parse("the-command --fred 42")).GetBindingContext();
+        var bindingContext = command.Parse("the-command --fred 42").GetBindingContext();
 
         var instance = (ClassWithMultiLetterSetters)binder.CreateInstance(bindingContext);
 
@@ -467,7 +465,7 @@ public void PropertyExpression_can_be_bound_to_argument()
             i => i.IntOption,
             argument);
 
-        var bindingContext = new InvocationContext(command.Parse("the-command 42")).GetBindingContext();
+        var bindingContext = command.Parse("the-command 42").GetBindingContext();
 
         var instance = (ClassWithMultiLetterSetters)binder.CreateInstance(bindingContext);
 
@@ -479,7 +477,7 @@ public void Option_argument_is_bound_to_longest_constructor()
     {
         var option = new Option<int>("--int-property");
 
-        var bindingContext = new InvocationContext(new RootCommand { option }.Parse("--int-property 42")).GetBindingContext();
+        var bindingContext = new RootCommand { option }.Parse("--int-property 42").GetBindingContext();
         var binder = new ModelBinder<ClassWithMultipleCtor>();
         var instance = binder.CreateInstance(bindingContext) as ClassWithMultipleCtor;
 
@@ -493,7 +491,7 @@ public void Command_argument_is_bound_to_longest_constructor()
         var rootCommand = new RootCommand();
         rootCommand.Arguments.Add(new Argument<int>(nameof(ClassWithMultipleCtor.IntProperty)));
 
-        var bindingContext = new InvocationContext(rootCommand.Parse("42")).GetBindingContext();
+        var bindingContext = rootCommand.Parse("42").GetBindingContext();
         var binder = new ModelBinder<ClassWithMultipleCtor>();
         var instance = binder.CreateInstance(bindingContext) as ClassWithMultipleCtor;
 
@@ -508,7 +506,7 @@ public void Explicit_model_binder_binds_only_to_configured_properties()
         var stringOption = new Option<string>("--string-property");
         RootCommand rootCommand = new RootCommand { intOption, stringOption };
 
-        var bindingContext = new InvocationContext(rootCommand.Parse("--int-property 42 --string-property Hello")).GetBindingContext();
+        var bindingContext = rootCommand.Parse("--int-property 42 --string-property Hello").GetBindingContext();
         var binder = new ModelBinder<ClassWithMultiLetterSetters>
         {
             EnforceExplicitBinding = true
@@ -717,7 +715,7 @@ public void Binder_does_not_match_by_substring()
     }
 
     [Fact]
-    public void InvocationContext_GetValue_with_generic_option_returns_value()
+    public void ParseResult_GetValue_with_generic_option_returns_value()
     {
         Option<int> option = new("--number");
         Command command = new("the-command")
@@ -725,15 +723,15 @@ public void InvocationContext_GetValue_with_generic_option_returns_value()
             option
         };
 
-        InvocationContext invocationContext = new(command.Parse("the-command --number 42"));
+        ParseResult parseResult = command.Parse("the-command --number 42");
 
-        invocationContext.GetValue(option)
+        parseResult.GetValue(option)
             .Should()
             .Be(42);
     }
 
     [Fact]
-    public void InvocationContext_GetValue_with_generic_argument_returns_value()
+    public void ParseResult_GetValue_with_generic_argument_returns_value()
     {
         Argument<int> argument = new("arg");
         Command command = new("the-command")
@@ -741,9 +739,9 @@ public void InvocationContext_GetValue_with_generic_argument_returns_value()
             argument
         };
 
-        InvocationContext invocationContext = new(command.Parse("the-command 42"));
+        ParseResult parseResult = command.Parse("the-command 42");
 
-        invocationContext.GetValue(argument)
+        parseResult.GetValue(argument)
             .Should()
             .Be(42);
     }
diff --git a/src/System.CommandLine.NamingConventionBinder.Tests/ModelBindingCommandHandlerTests.cs b/src/System.CommandLine.NamingConventionBinder.Tests/ModelBindingCommandHandlerTests.cs
index 89da866ea6..f5f814b79a 100644
--- a/src/System.CommandLine.NamingConventionBinder.Tests/ModelBindingCommandHandlerTests.cs
+++ b/src/System.CommandLine.NamingConventionBinder.Tests/ModelBindingCommandHandlerTests.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections.Generic;
-using System.CommandLine.Invocation;
 using System.CommandLine.Tests.Binding;
 using System.CommandLine.Utility;
 using System.IO;
@@ -42,11 +41,9 @@ public async Task Unspecified_option_arguments_with_no_default_value_are_bound_t
 
         var parseResult = command.Parse("");
 
-        var invocationContext = new InvocationContext(parseResult);
+        await handler.InvokeAsync(parseResult, CancellationToken.None);
 
-        await handler.InvokeAsync(invocationContext, CancellationToken.None);
-
-        BoundValueCapturer.GetBoundValue(invocationContext).Should().Be(expectedValue);
+        BoundValueCapturer.GetBoundValue(parseResult).Should().Be(expectedValue);
     }
     
     [Theory]
@@ -119,11 +116,9 @@ public async Task Handler_method_receives_option_arguments_bound_to_the_specifie
         var commandLine = string.Join(" ", testCase.CommandLineTokens.Select(t => $"--value {t}"));
         var parseResult = command.Parse(commandLine);
 
-        var invocationContext = new InvocationContext(parseResult);
-
-        await handler.InvokeAsync(invocationContext, CancellationToken.None);
+        await handler.InvokeAsync(parseResult, CancellationToken.None);
 
-        var boundValue = BoundValueCapturer.GetBoundValue(invocationContext);
+        var boundValue = BoundValueCapturer.GetBoundValue(parseResult);
 
         boundValue.Should().BeAssignableTo(testCase.ParameterType);
 
@@ -138,7 +133,7 @@ public async Task When_binding_fails_due_to_parameter_naming_mismatch_then_handl
         var o = new Option<string[]>("-i") { Description = "Path to an image or directory of supported images" };
 
         var command = new Command("command") { o };
-        command.Action = CommandHandler.Create<string[], InvocationContext>((nameDoesNotMatch, c) => received = nameDoesNotMatch);
+        command.Action = CommandHandler.Create<string[], ParseResult>((nameDoesNotMatch, c) => received = nameDoesNotMatch);
         CommandLineConfiguration config = new(command);
         config.Error = new StringWriter();
 
@@ -181,11 +176,9 @@ public async Task Handler_method_receives_command_arguments_bound_to_the_specifi
         var commandLine = string.Join(" ", testCase.CommandLineTokens);
         var parseResult = command.Parse(commandLine);
 
-        var invocationContext = new InvocationContext(parseResult);
-
-        await handler.InvokeAsync(invocationContext, CancellationToken.None);
+        await handler.InvokeAsync(parseResult, CancellationToken.None);
 
-        var boundValue = BoundValueCapturer.GetBoundValue(invocationContext);
+        var boundValue = BoundValueCapturer.GetBoundValue(parseResult);
 
         boundValue.Should().BeOfType(testCase.ParameterType);
 
@@ -233,11 +226,9 @@ public async Task Handler_method_receives_command_arguments_explicitly_bound_to_
         var commandLine = string.Join(" ", testCase.CommandLineTokens);
         var parseResult = command.Parse(commandLine);
 
-        var invocationContext = new InvocationContext(parseResult);
+        await handler.InvokeAsync(parseResult, CancellationToken.None);
 
-        await handler.InvokeAsync(invocationContext, CancellationToken.None);
-
-        var boundValue = BoundValueCapturer.GetBoundValue(invocationContext);
+        var boundValue = BoundValueCapturer.GetBoundValue(parseResult);
 
         boundValue.Should().BeOfType(testCase.ParameterType);
 
@@ -286,11 +277,9 @@ public async Task Handler_method_receive_option_arguments_explicitly_bound_to_th
         var commandLine = string.Join(" ", testCase.CommandLineTokens.Select(t => $"--value {t}"));
         var parseResult = command.Parse(commandLine);
 
-        var invocationContext = new InvocationContext(parseResult);
-
-        await handler.InvokeAsync(invocationContext, CancellationToken.None);
+        await handler.InvokeAsync(parseResult, CancellationToken.None);
 
-        var boundValue = BoundValueCapturer.GetBoundValue(invocationContext);
+        var boundValue = BoundValueCapturer.GetBoundValue(parseResult);
 
         boundValue.Should().BeOfType(testCase.ParameterType);
 
@@ -318,29 +307,29 @@ public async Task Unexpected_return_types_result_in_exit_code_0_if_no_exception_
         exitCode.Should().Be(0);
     }
 
-    private static void CaptureMethod<T>(T value, InvocationContext invocationContext)
+    private static void CaptureMethod<T>(T value, ParseResult parseResult)
     {
-        BoundValueCapturer.Capture(value, invocationContext);
+        BoundValueCapturer.Capture(value, parseResult);
     }
 
-    private static Action<T, InvocationContext> CaptureDelegate<T>()
-        => (value, invocationContext) =>
+    private static Action<T, ParseResult> CaptureDelegate<T>()
+        => (value, parseResult) =>
         {
-            BoundValueCapturer.Capture(value, invocationContext);
+            BoundValueCapturer.Capture(value, parseResult);
         };
 
     private static class BoundValueCapturer
     {
-        private static readonly Dictionary<InvocationContext, object> _boundValues = new ();
+        private static readonly Dictionary<ParseResult, object> _boundValues = new ();
 
-        public static void Apply(InvocationContext context)
+        public static void Apply(ParseResult context)
         {
         }
 
-        public static void Capture(object value, InvocationContext invocationContext)
+        public static void Capture(object value, ParseResult invocationContext)
             => _boundValues.Add(invocationContext, value);
 
-        public static object GetBoundValue(InvocationContext context)
+        public static object GetBoundValue(ParseResult context)
             => _boundValues.TryGetValue(context, out var value) ? value : null;
     }
 
diff --git a/src/System.CommandLine.NamingConventionBinder.Tests/ParameterBindingTests.cs b/src/System.CommandLine.NamingConventionBinder.Tests/ParameterBindingTests.cs
index 41edc177c1..8aa283aae9 100644
--- a/src/System.CommandLine.NamingConventionBinder.Tests/ParameterBindingTests.cs
+++ b/src/System.CommandLine.NamingConventionBinder.Tests/ParameterBindingTests.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.CommandLine.Binding;
-using System.CommandLine.Invocation;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -249,24 +248,6 @@ public async Task Method_parameters_of_type_ParseResult_receive_the_current_Bind
         boundContext.ParseResult.GetValue(option).Should().Be(123);
     }
 
-    [Fact]
-    public async Task Method_parameters_of_type_InvocationContext_receive_the_current_InvocationContext_instance()
-    {
-        InvocationContext boundContext = default;
-
-        var option = new Option<int>("-x");
-
-        var command = new Command("command")
-        {
-            option
-        };
-        command.Action = CommandHandler.Create<InvocationContext>(context => { boundContext = context; });
-
-        await command.Parse("command -x 123").InvokeAsync();
-
-        boundContext.ParseResult.GetValue(option).Should().Be(123);
-    }
-
     private class ExecuteTestClass
     {
         public string boundName = default;
@@ -427,9 +408,9 @@ public abstract class AbstractTestCommandHandler : CliAction
     {
         public abstract Task<int> DoJobAsync();
 
-        public override int Invoke(InvocationContext context) => InvokeAsync(context, CancellationToken.None).GetAwaiter().GetResult();
+        public override int Invoke(ParseResult context) => InvokeAsync(context, CancellationToken.None).GetAwaiter().GetResult();
 
-        public override Task<int> InvokeAsync(InvocationContext context, CancellationToken cancellationToken)
+        public override Task<int> InvokeAsync(ParseResult context, CancellationToken cancellationToken)
             => DoJobAsync();
     }
 
@@ -441,15 +422,15 @@ public override Task<int> DoJobAsync()
 
     public class VirtualTestCommandHandler : CliAction
     {
-        public override int Invoke(InvocationContext context) => 42;
+        public override int Invoke(ParseResult context) => 42;
 
-        public override Task<int> InvokeAsync(InvocationContext context, CancellationToken cancellationToken)
+        public override Task<int> InvokeAsync(ParseResult context, CancellationToken cancellationToken)
             => Task.FromResult(42);
     }
 
     public class OverridenVirtualTestCommandHandler : VirtualTestCommandHandler
     {
-        public override Task<int> InvokeAsync(InvocationContext context, CancellationToken cancellationToken)
+        public override Task<int> InvokeAsync(ParseResult context, CancellationToken cancellationToken)
             => Task.FromResult(41);
     }
 }
\ No newline at end of file
diff --git a/src/System.CommandLine.NamingConventionBinder/BindingContext.cs b/src/System.CommandLine.NamingConventionBinder/BindingContext.cs
index 19733fb5a4..fdec69b5d7 100644
--- a/src/System.CommandLine.NamingConventionBinder/BindingContext.cs
+++ b/src/System.CommandLine.NamingConventionBinder/BindingContext.cs
@@ -16,19 +16,16 @@ public sealed class BindingContext : IServiceProvider
     {
         private HelpBuilder? _helpBuilder;
 
-        internal BindingContext(InvocationContext invocationContext)
+        internal BindingContext(ParseResult parseResult)
         {
-            InvocationContext = invocationContext;
+            ParseResult = parseResult;
             ServiceProvider = new ServiceProvider(this);
-            ServiceProvider.AddService(_ => InvocationContext);
         }
 
-        internal InvocationContext InvocationContext { get; }
-
         /// <summary>
         /// The parse result for the current invocation.
         /// </summary>
-        public ParseResult ParseResult => InvocationContext.ParseResult;
+        public ParseResult ParseResult { get; }
         
         internal HelpBuilder HelpBuilder => _helpBuilder ??= (HelpBuilder)ServiceProvider.GetService(typeof(HelpBuilder))!;
 
diff --git a/src/System.CommandLine.NamingConventionBinder/BindingContextExtensions.cs b/src/System.CommandLine.NamingConventionBinder/BindingContextExtensions.cs
index b3badc4a99..d72b2647bd 100644
--- a/src/System.CommandLine.NamingConventionBinder/BindingContextExtensions.cs
+++ b/src/System.CommandLine.NamingConventionBinder/BindingContextExtensions.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.CommandLine.Binding;
-using System.CommandLine.Invocation;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -15,20 +14,20 @@ public static class BindingContextExtensions
 {
     private sealed class DummyStateHoldingHandler : BindingHandler
     {
-        public override int Invoke(InvocationContext context) => 0;
+        public override int Invoke(ParseResult parseResult) => 0;
 
-        public override Task<int> InvokeAsync(InvocationContext context, CancellationToken cancellationToken = default) => Task.FromResult(0);
+        public override Task<int> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken = default) => Task.FromResult(0);
     }
 
-    public static BindingContext GetBindingContext(this InvocationContext ctx)
+    public static BindingContext GetBindingContext(this ParseResult parseResult)
     {
         // parsing resulted with no handler or it was not created yet, we fake it to just store the BindingContext between the calls
-        if (ctx.ParseResult.CommandResult.Command.Action is null)
+        if (parseResult.CommandResult.Command.Action is null)
         {
-            ctx.ParseResult.CommandResult.Command.Action = new DummyStateHoldingHandler();
+            parseResult.CommandResult.Command.Action = new DummyStateHoldingHandler();
         }
 
-        return ((BindingHandler)ctx.ParseResult.CommandResult.Command.Action).GetBindingContext(ctx);
+        return ((BindingHandler)parseResult.CommandResult.Command.Action).GetBindingContext(parseResult);
     }
 
     /// <summary>
diff --git a/src/System.CommandLine.NamingConventionBinder/BindingHandler.cs b/src/System.CommandLine.NamingConventionBinder/BindingHandler.cs
index b0f1ca1777..5422c44d5d 100644
--- a/src/System.CommandLine.NamingConventionBinder/BindingHandler.cs
+++ b/src/System.CommandLine.NamingConventionBinder/BindingHandler.cs
@@ -1,5 +1,4 @@
 using System.CommandLine.Binding;
-using System.CommandLine.Invocation;
 
 namespace System.CommandLine.NamingConventionBinder
 {
@@ -10,7 +9,7 @@ public abstract class BindingHandler : CliAction
         /// <summary>
         /// The binding context for the current invocation.
         /// </summary>
-        public virtual BindingContext GetBindingContext(InvocationContext invocationContext)
-            => _bindingContext ??= new BindingContext(invocationContext);
+        public virtual BindingContext GetBindingContext(ParseResult parseResult)
+            => _bindingContext ??= new BindingContext(parseResult);
     }
 }
diff --git a/src/System.CommandLine.NamingConventionBinder/CommandHandler.cs b/src/System.CommandLine.NamingConventionBinder/CommandHandler.cs
index 59681cc054..00a81429f5 100644
--- a/src/System.CommandLine.NamingConventionBinder/CommandHandler.cs
+++ b/src/System.CommandLine.NamingConventionBinder/CommandHandler.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Invocation;
 using System.Reflection;
 using System.Threading.Tasks;
 
@@ -605,7 +604,7 @@ public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, Task<int>> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
-    internal static async Task<int> GetExitCodeAsync(object? returnValue, InvocationContext context)
+    internal static async Task<int> GetExitCodeAsync(object? returnValue)
     {
         switch (returnValue)
         {
diff --git a/src/System.CommandLine.NamingConventionBinder/ModelBindingCommandHandler.cs b/src/System.CommandLine.NamingConventionBinder/ModelBindingCommandHandler.cs
index d69576fd56..a643cecf19 100644
--- a/src/System.CommandLine.NamingConventionBinder/ModelBindingCommandHandler.cs
+++ b/src/System.CommandLine.NamingConventionBinder/ModelBindingCommandHandler.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.CommandLine.Binding;
-using System.CommandLine.Invocation;
 using System.Linq;
 using System.Reflection;
 using System.Threading;
@@ -54,12 +53,12 @@ internal ModelBindingCommandHandler(
     /// <summary>
     /// Binds values for the underlying user-defined method and uses them to invoke that method.
     /// </summary>
-    /// <param name="context">The current invocation context.</param>
+    /// <param name="parseResult">The current parse result.</param>
     /// <param name="cancellationToken">A token that can be used to cancel the invocation.</param>
     /// <returns>A task whose value can be used to set the process exit code.</returns>
-    public override async Task<int> InvokeAsync(InvocationContext context, CancellationToken cancellationToken = default)
+    public override async Task<int> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken = default)
     {
-        var bindingContext = GetBindingContext(context);
+        var bindingContext = GetBindingContext(parseResult);
 
         var (boundValues, _) = ModelBinder.GetBoundValues(
             _invokeArgumentBindingSources,
@@ -89,7 +88,7 @@ public override async Task<int> InvokeAsync(InvocationContext context, Cancellat
             result = _handlerDelegate.DynamicInvoke(invocationArguments);
         }
 
-        return await CommandHandler.GetExitCodeAsync(result, context);
+        return await CommandHandler.GetExitCodeAsync(result);
     }
 
     /// <summary>
@@ -132,5 +131,5 @@ private void BindValueSource(ParameterInfo param, IValueSource valueSource)
                                                        x.ValueType == param.ParameterType);
 
     /// <inheritdoc />
-    public override int Invoke(InvocationContext context) => InvokeAsync(context, CancellationToken.None).GetAwaiter().GetResult();
+    public override int Invoke(ParseResult parseResult) => InvokeAsync(parseResult, CancellationToken.None).GetAwaiter().GetResult();
 }
\ No newline at end of file
diff --git a/src/System.CommandLine.Rendering.Tests/TerminalModeTests.cs b/src/System.CommandLine.Rendering.Tests/TerminalModeTests.cs
index 86724e1d82..7b19fe47f8 100644
--- a/src/System.CommandLine.Rendering.Tests/TerminalModeTests.cs
+++ b/src/System.CommandLine.Rendering.Tests/TerminalModeTests.cs
@@ -2,9 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.CommandLine.IO;
-using System.CommandLine.Parsing;
 using System.CommandLine.Tests.Utility;
-using System.Threading.Tasks;
 using FluentAssertions;
 using Xunit;
 using Xunit.Abstractions;
diff --git a/src/System.CommandLine.Rendering.Tests/ViewRenderingTests.cs b/src/System.CommandLine.Rendering.Tests/ViewRenderingTests.cs
index aa233787e2..2ad86c9084 100644
--- a/src/System.CommandLine.Rendering.Tests/ViewRenderingTests.cs
+++ b/src/System.CommandLine.Rendering.Tests/ViewRenderingTests.cs
@@ -27,7 +27,7 @@ public void Views_can_be_used_for_specific_types()
             var command = new RootCommand();
             command.SetAction(ctx =>
             {
-                parseResult = ctx.ParseResult;
+                parseResult = ctx;
                 terminal.Append(new ParseResultView(parseResult));
             });
 
diff --git a/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/Program.cs b/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/Program.cs
index f809e38a33..23f203a01b 100644
--- a/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/Program.cs
+++ b/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/Program.cs
@@ -1,6 +1,5 @@
 using System.CommandLine;
 using System.CommandLine.Help;
-using System.CommandLine.Invocation;
 using System.CommandLine.Parsing;
 using System.Threading.Tasks;
 using System.Threading;
@@ -24,12 +23,12 @@ static async Task Main(string[] args)
                 durianOption,
             };
 
-            rootCommand.SetAction((InvocationContext ctx, CancellationToken cancellationToken) =>
+            rootCommand.SetAction((ParseResult ctx, CancellationToken cancellationToken) =>
             {
-                string apple = ctx.ParseResult.GetValue(appleOption);
-                string banana = ctx.ParseResult.GetValue(bananaOption);
-                string cherry = ctx.ParseResult.GetValue(cherryOption);
-                string durian = ctx.ParseResult.GetValue(durianOption);
+                string apple = ctx.GetValue(appleOption);
+                string banana = ctx.GetValue(bananaOption);
+                string cherry = ctx.GetValue(cherryOption);
+                string durian = ctx.GetValue(durianOption);
 
                 return Task.CompletedTask;
             });
diff --git a/src/System.CommandLine.Suggest/SuggestionDispatcher.cs b/src/System.CommandLine.Suggest/SuggestionDispatcher.cs
index 4eb2e7a08f..dbf23a6def 100644
--- a/src/System.CommandLine.Suggest/SuggestionDispatcher.cs
+++ b/src/System.CommandLine.Suggest/SuggestionDispatcher.cs
@@ -2,8 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections.Generic;
-using System.CommandLine.Help;
-using System.CommandLine.Invocation;
 using System.IO;
 using System.Linq;
 using System.Threading;
@@ -30,7 +28,7 @@ public SuggestionDispatcher(ISuggestionRegistration suggestionRegistration, ISug
             };
             CompleteScriptCommand.SetAction(context =>
             {
-                SuggestionShellScriptHandler.Handle(context.ParseResult.Configuration.Output, context.ParseResult.GetValue(shellTypeArgument));
+                SuggestionShellScriptHandler.Handle(context.Configuration.Output, context.GetValue(shellTypeArgument));
             });
 
             ListCommand = new Command("list")
@@ -39,7 +37,7 @@ public SuggestionDispatcher(ISuggestionRegistration suggestionRegistration, ISug
             };
             ListCommand.SetAction((ctx, cancellationToken) =>
             {
-                ctx.ParseResult.Configuration.Output.WriteLine(ShellPrefixesToMatch(_suggestionRegistration));
+                ctx.Configuration.Output.WriteLine(ShellPrefixesToMatch(_suggestionRegistration));
                 return Task.CompletedTask;
             });
 
@@ -60,7 +58,7 @@ public SuggestionDispatcher(ISuggestionRegistration suggestionRegistration, ISug
 
             RegisterCommand.SetAction((context, cancellationToken) =>
             {
-                Register(context.ParseResult.GetValue(commandPathOption), context.ParseResult.Configuration.Output);
+                Register(context.GetValue(commandPathOption), context.Configuration.Output);
                 return Task.CompletedTask;
             });
 
@@ -131,9 +129,8 @@ private void Register(
             }
         }
 
-        private Task<int> Get(InvocationContext context, CancellationToken cancellationToken)
+        private Task<int> Get(ParseResult parseResult, CancellationToken cancellationToken)
         {
-            var parseResult = context.ParseResult;
             var commandPath = parseResult.GetValue(ExecutableOption);
 
             Registration suggestionRegistration;
@@ -177,7 +174,7 @@ private Task<int> Get(InvocationContext context, CancellationToken cancellationT
             Program.LogDebug($"dotnet-suggest returning: \"{completions.Replace("\r", "\\r").Replace("\n", "\\n")}\"");
 #endif
 
-            context.ParseResult.Configuration.Output.Write(completions);
+            parseResult.Configuration.Output.Write(completions);
 
             return Task.FromResult(0);
         }
diff --git a/src/System.CommandLine.Tests/Binding/SetHandlerTests.cs b/src/System.CommandLine.Tests/Binding/SetHandlerTests.cs
index cfbaae4ac9..9cd59e8d18 100644
--- a/src/System.CommandLine.Tests/Binding/SetHandlerTests.cs
+++ b/src/System.CommandLine.Tests/Binding/SetHandlerTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Invocation;
 using System.Threading;
 using System.Threading.Tasks;
 using FluentAssertions;
@@ -32,9 +31,9 @@ public async Task When_User_Requests_Cancellation_Its_Reflected_By_The_Token_Pas
 
         private sealed class CustomCliAction : CliAction
         {
-            public override int Invoke(InvocationContext context) => throw new NotImplementedException();
+            public override int Invoke(ParseResult parseResult) => throw new NotImplementedException();
 
-            public async override Task<int> InvokeAsync(InvocationContext context, CancellationToken cancellationToken = default)
+            public async override Task<int> InvokeAsync(ParseResult context, CancellationToken cancellationToken = default)
             {
                 try
                 {
diff --git a/src/System.CommandLine.Tests/Invocation/CancelOnProcessTerminationTests.cs b/src/System.CommandLine.Tests/Invocation/CancelOnProcessTerminationTests.cs
index 997760cd54..dcf22bb1dd 100644
--- a/src/System.CommandLine.Tests/Invocation/CancelOnProcessTerminationTests.cs
+++ b/src/System.CommandLine.Tests/Invocation/CancelOnProcessTerminationTests.cs
@@ -2,8 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using FluentAssertions;
-using System.CommandLine.Invocation;
-using System.CommandLine.Parsing;
 using System.CommandLine.Tests.Utility;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
@@ -65,9 +63,9 @@ private static Task<int> Program(string[] args)
 
         private sealed class CustomCliAction : CliAction
         {
-            public override int Invoke(InvocationContext context) => throw new NotImplementedException();
+            public override int Invoke(ParseResult context) => throw new NotImplementedException();
 
-            public async override Task<int> InvokeAsync(InvocationContext context, CancellationToken cancellationToken = default)
+            public async override Task<int> InvokeAsync(ParseResult context, CancellationToken cancellationToken = default)
             {
                 Console.WriteLine(ChildProcessWaiting);
 
diff --git a/src/System.CommandLine.Tests/Invocation/InvocationExtensionsTests.cs b/src/System.CommandLine.Tests/Invocation/InvocationExtensionsTests.cs
index 453e801240..693a39849e 100644
--- a/src/System.CommandLine.Tests/Invocation/InvocationExtensionsTests.cs
+++ b/src/System.CommandLine.Tests/Invocation/InvocationExtensionsTests.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.CommandLine.Help;
-using System.CommandLine.Invocation;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -192,10 +191,10 @@ public async Task Anonymous_RootCommand_int_returning_Action_can_set_custom_resu
 
         internal sealed class CustomExitCodeAction : CliAction
         {
-            public override int Invoke(InvocationContext context)
+            public override int Invoke(ParseResult context)
                 => 123;
 
-            public override Task<int> InvokeAsync(InvocationContext context, CancellationToken cancellationToken = default)
+            public override Task<int> InvokeAsync(ParseResult context, CancellationToken cancellationToken = default)
                 => Task.FromResult(456);
         }
 
diff --git a/src/System.CommandLine.Tests/OptionTests.cs b/src/System.CommandLine.Tests/OptionTests.cs
index 7b103ab491..dcd4714a43 100644
--- a/src/System.CommandLine.Tests/OptionTests.cs
+++ b/src/System.CommandLine.Tests/OptionTests.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using FluentAssertions;
-using System.CommandLine.Invocation;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -382,13 +381,13 @@ internal sealed class OptionAction : CliAction
         {
             internal bool WasCalled = false;
 
-            public override int Invoke(InvocationContext context)
+            public override int Invoke(ParseResult context)
             {
                 WasCalled = true;
                 return 0;
             }
 
-            public override Task<int> InvokeAsync(InvocationContext context, CancellationToken cancellationToken = default)
+            public override Task<int> InvokeAsync(ParseResult context, CancellationToken cancellationToken = default)
                 => Task.FromResult(Invoke(context));
         }
 
diff --git a/src/System.CommandLine.Tests/TestApps/NativeAOT/Program.cs b/src/System.CommandLine.Tests/TestApps/NativeAOT/Program.cs
index b6be32deec..ccc111f88d 100644
--- a/src/System.CommandLine.Tests/TestApps/NativeAOT/Program.cs
+++ b/src/System.CommandLine.Tests/TestApps/NativeAOT/Program.cs
@@ -1,6 +1,5 @@
 using System;
 using System.CommandLine;
-using System.CommandLine.Invocation;
 using System.CommandLine.Parsing;
 
 public class Program
@@ -20,10 +19,10 @@ private static int Main(string[] args)
 
         return new CommandLineConfiguration(command).Invoke(args);
 
-        void Run(InvocationContext context)
+        void Run(ParseResult parseResult)
         {
-            Console.WriteLine($"Bool option: {context.ParseResult.GetValue(boolOption)}");
-            Console.WriteLine($"String option: {context.ParseResult.GetValue(stringOption)}");
+            Console.WriteLine($"Bool option: {parseResult.GetValue(boolOption)}");
+            Console.WriteLine($"String option: {parseResult.GetValue(stringOption)}");
         }
     }
 }
\ No newline at end of file
diff --git a/src/System.CommandLine.Tests/TestApps/Trimming/Program.cs b/src/System.CommandLine.Tests/TestApps/Trimming/Program.cs
index 825c084289..4a7b10dbe8 100644
--- a/src/System.CommandLine.Tests/TestApps/Trimming/Program.cs
+++ b/src/System.CommandLine.Tests/TestApps/Trimming/Program.cs
@@ -9,9 +9,9 @@
     fileArgument
 };
 
-command.SetAction(context =>
+command.SetAction(parseResult =>
 {
-    Console.Write($"The file you chose was: {context.ParseResult.GetValue(fileArgument)}");
+    Console.Write($"The file you chose was: {parseResult.GetValue(fileArgument)}");
 });
 
 command.Parse(args).Invoke();
diff --git a/src/System.CommandLine/CliAction.cs b/src/System.CommandLine/CliAction.cs
index f712bbe055..33d5004157 100644
--- a/src/System.CommandLine/CliAction.cs
+++ b/src/System.CommandLine/CliAction.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Invocation;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -15,16 +14,16 @@ public abstract class CliAction
         /// <summary>
         /// Performs an action when the associated symbol is invoked on the command line.
         /// </summary>
-        /// <param name="context">Provides context for the invocation, including parse results and binding support.</param>
+        /// <param name="parseResult">Provides the parse results.</param>
         /// <returns>A value that can be used as the exit code for the process.</returns>
-        public abstract int Invoke(InvocationContext context);
+        public abstract int Invoke(ParseResult parseResult);
 
         /// <summary>
         /// Performs an action when the associated symbol is invoked on the command line.
         /// </summary>
-        /// <param name="context">Provides context for the invocation, including parse results and binding support.</param>
+        /// <param name="parseResult">Provides the parse results.</param>
         /// <param name="cancellationToken">The token to monitor for cancellation requests.</param>
         /// <returns>A value that can be used as the exit code for the process.</returns>
-        public abstract Task<int> InvokeAsync(InvocationContext context, CancellationToken cancellationToken = default);
+        public abstract Task<int> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken = default);
     }
 }
diff --git a/src/System.CommandLine/Command.cs b/src/System.CommandLine/Command.cs
index 36e48edcbb..596ff23702 100644
--- a/src/System.CommandLine/Command.cs
+++ b/src/System.CommandLine/Command.cs
@@ -95,7 +95,7 @@ public IEnumerable<Symbol> Children
         /// that will be performed when the Command is invoked.
         /// </summary>
         /// <remarks>
-        /// <para>Use one of the <see cref="SetAction(Action{InvocationContext})" /> overloads to construct a handler.</para>
+        /// <para>Use one of the <see cref="SetAction(Action{ParseResult})" /> overloads to construct a handler.</para>
         /// <para>If the handler is not specified, parser errors will be generated for command line input that
         /// invokes this Command.</para></remarks>
         public CliAction? Action { get; set; }
@@ -103,7 +103,7 @@ public IEnumerable<Symbol> Children
         /// <summary>
         /// Sets a synchronous action to be run when the command is invoked.
         /// </summary>
-        public void SetAction(Action<InvocationContext> action)
+        public void SetAction(Action<ParseResult> action)
         {
             if (action is null)
             {
@@ -121,7 +121,7 @@ public void SetAction(Action<InvocationContext> action)
         /// Sets a synchronous action to be run when the command is invoked.
         /// </summary>
         /// <remarks>The value returned from the <paramref name="action"/> delegate can be used to set the process exit code.</remarks>
-        public void SetAction(Func<InvocationContext, int> action)
+        public void SetAction(Func<ParseResult, int> action)
         {
             if (action is null)
             {
@@ -134,7 +134,7 @@ public void SetAction(Func<InvocationContext, int> action)
         /// <summary>
         /// Sets an asynchronous action to be run when the command is invoked.
         /// </summary>
-        public void SetAction(Func<InvocationContext, CancellationToken, Task> action)
+        public void SetAction(Func<ParseResult, CancellationToken, Task> action)
         {
             if (action is null)
             {
@@ -152,7 +152,7 @@ public void SetAction(Func<InvocationContext, CancellationToken, Task> action)
         /// Sets an asynchronous action when the command is invoked.
         /// </summary>
         /// <remarks>The value returned from the <paramref name="action"/> delegate can be used to set the process exit code.</remarks>
-        public void SetAction(Func<InvocationContext, CancellationToken, Task<int>> action)
+        public void SetAction(Func<ParseResult, CancellationToken, Task<int>> action)
         {
             if (action is null)
             {
diff --git a/src/System.CommandLine/EnvironmentVariablesDirective.cs b/src/System.CommandLine/EnvironmentVariablesDirective.cs
index 8714f90b59..f204a38035 100644
--- a/src/System.CommandLine/EnvironmentVariablesDirective.cs
+++ b/src/System.CommandLine/EnvironmentVariablesDirective.cs
@@ -1,5 +1,4 @@
-using System.CommandLine.Invocation;
-using System.CommandLine.Parsing;
+using System.CommandLine.Parsing;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -29,30 +28,30 @@ private sealed class EnvironmentVariablesDirectiveAction : CliAction
 
             internal EnvironmentVariablesDirectiveAction(EnvironmentVariablesDirective directive) => _directive = directive;
 
-            public override int Invoke(InvocationContext context)
+            public override int Invoke(ParseResult parseResult)
             {
-                SetEnvVars(context);
+                SetEnvVars(parseResult);
 
-                return context.ParseResult.CommandResult.Command.Action?.Invoke(context) ?? 0;
+                return parseResult.CommandResult.Command.Action?.Invoke(parseResult) ?? 0;
             }
 
-            public override Task<int> InvokeAsync(InvocationContext context, CancellationToken cancellationToken = default)
+            public override Task<int> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken = default)
             {
                 if (cancellationToken.IsCancellationRequested)
                 {
                     return Task.FromCanceled<int>(cancellationToken);
                 }
 
-                SetEnvVars(context);
+                SetEnvVars(parseResult);
 
-                return context.ParseResult.CommandResult.Command.Action is not null
-                    ? context.ParseResult.CommandResult.Command.Action.InvokeAsync(context, cancellationToken)
+                return parseResult.CommandResult.Command.Action is not null
+                    ? parseResult.CommandResult.Command.Action.InvokeAsync(parseResult, cancellationToken)
                     : Task.FromResult(0);
             }
 
-            private void SetEnvVars(InvocationContext context)
+            private void SetEnvVars(ParseResult parseResult)
             {
-                DirectiveResult directiveResult = context.ParseResult.FindResultFor(_directive)!;
+                DirectiveResult directiveResult = parseResult.FindResultFor(_directive)!;
 
                 for (int i = 0; i < directiveResult.Values.Count; i++)
                 {
diff --git a/src/System.CommandLine/Help/HelpOptionAction.cs b/src/System.CommandLine/Help/HelpOptionAction.cs
index abc48fcd06..185a6fc94f 100644
--- a/src/System.CommandLine/Help/HelpOptionAction.cs
+++ b/src/System.CommandLine/Help/HelpOptionAction.cs
@@ -1,5 +1,4 @@
-using System.CommandLine.Invocation;
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace System.CommandLine.Help
@@ -17,23 +16,23 @@ public HelpBuilder Builder
             set => _builder = value ?? throw new ArgumentNullException(nameof(value));
         }
 
-        public override int Invoke(InvocationContext context)
+        public override int Invoke(ParseResult parseResult)
         {
-            var output = context.ParseResult.Configuration.Output;
+            var output = parseResult.Configuration.Output;
 
             var helpContext = new HelpContext(Builder,
-                                              context.ParseResult.CommandResult.Command,
+                                              parseResult.CommandResult.Command,
                                               output,
-                                              context.ParseResult);
+                                              parseResult);
 
             Builder.Write(helpContext);
 
             return 0;
         }
 
-        public override Task<int> InvokeAsync(InvocationContext context, CancellationToken cancellationToken = default)
+        public override Task<int> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken = default)
             => cancellationToken.IsCancellationRequested
                 ? Task.FromCanceled<int>(cancellationToken)
-                : Task.FromResult(Invoke(context));
+                : Task.FromResult(Invoke(parseResult));
     }
 }
diff --git a/src/System.CommandLine/Help/VersionOption.cs b/src/System.CommandLine/Help/VersionOption.cs
index ecae101bd4..ff239ac1c0 100644
--- a/src/System.CommandLine/Help/VersionOption.cs
+++ b/src/System.CommandLine/Help/VersionOption.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Invocation;
 using System.CommandLine.Parsing;
 using System.Linq;
 using System.Threading;
@@ -68,16 +67,16 @@ private static bool IsNotImplicit(SymbolResult symbolResult)
 
         private sealed class VersionOptionAction : CliAction
         {
-            public override int Invoke(InvocationContext context)
+            public override int Invoke(ParseResult parseResult)
             {
-                context.ParseResult.Configuration.Output.WriteLine(RootCommand.ExecutableVersion);
+                parseResult.Configuration.Output.WriteLine(RootCommand.ExecutableVersion);
                 return 0;
             }
 
-            public override Task<int> InvokeAsync(InvocationContext context, CancellationToken cancellationToken = default)
+            public override Task<int> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken = default)
                 => cancellationToken.IsCancellationRequested
                     ? Task.FromCanceled<int>(cancellationToken)
-                    : Task.FromResult(Invoke(context));
+                    : Task.FromResult(Invoke(parseResult));
         }
     }
 }
\ No newline at end of file
diff --git a/src/System.CommandLine/Invocation/AnonymousCliAction.cs b/src/System.CommandLine/Invocation/AnonymousCliAction.cs
index 2c940ecc5d..5b0b048792 100644
--- a/src/System.CommandLine/Invocation/AnonymousCliAction.cs
+++ b/src/System.CommandLine/Invocation/AnonymousCliAction.cs
@@ -8,39 +8,39 @@ namespace System.CommandLine.Invocation
 {
     internal sealed class AnonymousCliAction : CliAction
     {
-        private readonly Func<InvocationContext, CancellationToken, Task<int>>? _asyncAction;
-        private readonly Func<InvocationContext, int>? _syncAction;
+        private readonly Func<ParseResult, CancellationToken, Task<int>>? _asyncAction;
+        private readonly Func<ParseResult, int>? _syncAction;
 
-        internal AnonymousCliAction(Func<InvocationContext, int> action)
+        internal AnonymousCliAction(Func<ParseResult, int> action)
             => _syncAction = action;
 
-        internal AnonymousCliAction(Func<InvocationContext, CancellationToken, Task<int>> action)
+        internal AnonymousCliAction(Func<ParseResult, CancellationToken, Task<int>> action)
             => _asyncAction = action;
 
-        public override int Invoke(InvocationContext context)
+        public override int Invoke(ParseResult parseResult)
         {
             if (_syncAction is not null)
             {
-                return _syncAction(context);
+                return _syncAction(parseResult);
             }
             else
             {
-                return SyncUsingAsync(context); // kept in a separate method to avoid JITting
+                return SyncUsingAsync(parseResult); // kept in a separate method to avoid JITting
             }
 
-            int SyncUsingAsync(InvocationContext context)
-                => _asyncAction!(context, CancellationToken.None).GetAwaiter().GetResult();
+            int SyncUsingAsync(ParseResult parseResult)
+                => _asyncAction!(parseResult, CancellationToken.None).GetAwaiter().GetResult();
         }
 
-        public override async Task<int> InvokeAsync(InvocationContext context, CancellationToken cancellationToken)
+        public override async Task<int> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken)
         {
             if (_asyncAction is not null)
             {
-                return await _asyncAction(context, cancellationToken);
+                return await _asyncAction(parseResult, cancellationToken);
             }
             else
             {
-               return _syncAction!(context);
+               return _syncAction!(parseResult);
             }
         }
     }
diff --git a/src/System.CommandLine/Invocation/InvocationContext.cs b/src/System.CommandLine/Invocation/InvocationContext.cs
deleted file mode 100644
index a4c64ef51c..0000000000
--- a/src/System.CommandLine/Invocation/InvocationContext.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace System.CommandLine.Invocation
-{
-    /// <summary>
-    /// Supports command invocation by providing access to parse results and other services.
-    /// </summary>
-    public sealed class InvocationContext
-    {
-        /// <param name="parseResult">The result of the current parse operation.</param>
-        public InvocationContext(ParseResult parseResult)
-        {
-            ParseResult = parseResult;
-        }
-
-        /// <summary>
-        /// The parse result for the current invocation.
-        /// </summary>
-        public ParseResult ParseResult { get; set; }
-
-        /// <inheritdoc cref="ParseResult.GetValue{T}(Option{T})"/>
-        public T? GetValue<T>(Option<T> option)
-            => ParseResult.GetValue(option);
-
-        /// <inheritdoc cref="ParseResult.GetValue{T}(Argument{T})"/>
-        public T? GetValue<T>(Argument<T> argument)
-            => ParseResult.GetValue(argument);
-    }
-}
diff --git a/src/System.CommandLine/Invocation/InvocationPipeline.cs b/src/System.CommandLine/Invocation/InvocationPipeline.cs
index 0c3eaa73b6..68464b2feb 100644
--- a/src/System.CommandLine/Invocation/InvocationPipeline.cs
+++ b/src/System.CommandLine/Invocation/InvocationPipeline.cs
@@ -15,13 +15,12 @@ internal static async Task<int> InvokeAsync(ParseResult parseResult, Cancellatio
                 return 0;
             }
 
-            InvocationContext context = new (parseResult);
             ProcessTerminationHandler? terminationHandler = null;
             using CancellationTokenSource cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
 
             try
             {
-                Task<int> startedInvocation = parseResult.Action.InvokeAsync(context, cts.Token);
+                Task<int> startedInvocation = parseResult.Action.InvokeAsync(parseResult, cts.Token);
 
                 if (parseResult.Configuration.ProcessTerminationTimeout.HasValue)
                     terminationHandler = new(cts, startedInvocation, parseResult.Configuration.ProcessTerminationTimeout.Value);
@@ -56,11 +55,9 @@ internal static int Invoke(ParseResult parseResult)
                 return 0;
             }
 
-            InvocationContext context = new (parseResult);
-
             try
             {
-                return parseResult.Action.Invoke(context);
+                return parseResult.Action.Invoke(parseResult);
             }
             catch (Exception ex) when (parseResult.Configuration.EnableDefaultExceptionHandler)
             {
diff --git a/src/System.CommandLine/Invocation/ParseErrorResult.cs b/src/System.CommandLine/Invocation/ParseErrorResult.cs
index 35a32b0967..1b3d43e4d7 100644
--- a/src/System.CommandLine/Invocation/ParseErrorResult.cs
+++ b/src/System.CommandLine/Invocation/ParseErrorResult.cs
@@ -9,28 +9,28 @@ namespace System.CommandLine.Invocation
 {
     internal sealed class ParseErrorResultAction : CliAction
     {
-        public override int Invoke(InvocationContext context)
+        public override int Invoke(ParseResult parseResult)
         {
             ConsoleHelpers.ResetTerminalForegroundColor();
             ConsoleHelpers.SetTerminalForegroundRed();
 
-            foreach (var error in context.ParseResult.Errors)
+            foreach (var error in parseResult.Errors)
             {
-                context.ParseResult.Configuration.Error.WriteLine(error.Message);
+                parseResult.Configuration.Error.WriteLine(error.Message);
             }
 
-            context.ParseResult.Configuration.Error.WriteLine();
+            parseResult.Configuration.Error.WriteLine();
 
             ConsoleHelpers.ResetTerminalForegroundColor();
 
-            new HelpOption().Action!.Invoke(context);
+            new HelpOption().Action!.Invoke(parseResult);
 
             return 1;
         }
 
-        public override Task<int> InvokeAsync(InvocationContext context, CancellationToken cancellationToken = default)
+        public override Task<int> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken = default)
             => cancellationToken.IsCancellationRequested
                 ? Task.FromCanceled<int>(cancellationToken)
-                : Task.FromResult(Invoke(context));
+                : Task.FromResult(Invoke(parseResult));
     }
 }
\ No newline at end of file
diff --git a/src/System.CommandLine/Invocation/TypoCorrection.cs b/src/System.CommandLine/Invocation/TypoCorrection.cs
index 66fe914a44..e3c1e4e0d5 100644
--- a/src/System.CommandLine/Invocation/TypoCorrection.cs
+++ b/src/System.CommandLine/Invocation/TypoCorrection.cs
@@ -12,18 +12,16 @@ internal sealed class TypoCorrectionAction : CliAction
     {
         private const int MaxLevenshteinDistance = 3;
 
-        public override int Invoke(InvocationContext context)
-            => ProvideSuggestions(context);
+        public override int Invoke(ParseResult parseResult)
+            => ProvideSuggestions(parseResult);
 
-        public override Task<int> InvokeAsync(InvocationContext context, CancellationToken cancellationToken = default)
+        public override Task<int> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken = default)
             => cancellationToken.IsCancellationRequested
                 ? Task.FromCanceled<int>(cancellationToken)
-                : Task.FromResult(ProvideSuggestions(context));
+                : Task.FromResult(ProvideSuggestions(parseResult));
 
-        private static int ProvideSuggestions(InvocationContext context)
+        private static int ProvideSuggestions(ParseResult result)
         {
-            ParseResult result = context.ParseResult;
-
             var unmatchedTokens = result.UnmatchedTokens;
             for (var i = 0; i < unmatchedTokens.Length; i++)
             {
diff --git a/src/System.CommandLine/ParseDirective.cs b/src/System.CommandLine/ParseDirective.cs
index ab4618a4e7..099b504ec4 100644
--- a/src/System.CommandLine/ParseDirective.cs
+++ b/src/System.CommandLine/ParseDirective.cs
@@ -1,5 +1,4 @@
-using System.CommandLine.Invocation;
-using System.CommandLine.Parsing;
+using System.CommandLine.Parsing;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -35,17 +34,16 @@ private sealed class ParseDirectiveAction : CliAction
 
             internal ParseDirectiveAction(int errorExitCode) => _errorExitCode = errorExitCode;
 
-            public override int Invoke(InvocationContext context)
+            public override int Invoke(ParseResult parseResult)
             {
-                var parseResult = context.ParseResult;
-                context.ParseResult.Configuration.Output.WriteLine(parseResult.Diagram());
+                parseResult.Configuration.Output.WriteLine(parseResult.Diagram());
                 return parseResult.Errors.Count == 0 ? 0 : _errorExitCode;
             }
 
-            public override Task<int> InvokeAsync(InvocationContext context, CancellationToken cancellationToken = default)
+            public override Task<int> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken = default)
                 => cancellationToken.IsCancellationRequested
                     ? Task.FromCanceled<int>(cancellationToken)
-                    : Task.FromResult(Invoke(context));
+                    : Task.FromResult(Invoke(parseResult));
         }
     }
 }
diff --git a/src/System.CommandLine/SuggestDirective.cs b/src/System.CommandLine/SuggestDirective.cs
index 5d11186d68..125aeed320 100644
--- a/src/System.CommandLine/SuggestDirective.cs
+++ b/src/System.CommandLine/SuggestDirective.cs
@@ -1,5 +1,4 @@
-using System.CommandLine.Invocation;
-using System.Linq;
+using System.Linq;
 using System.CommandLine.Parsing;
 using System.Threading.Tasks;
 using System.Threading;
@@ -31,9 +30,8 @@ private sealed class SuggestDirectiveAction : CliAction
 
             internal SuggestDirectiveAction(SuggestDirective suggestDirective) => _directive = suggestDirective;
 
-            public override int Invoke(InvocationContext context)
+            public override int Invoke(ParseResult parseResult)
             {
-                ParseResult parseResult = context.ParseResult;
                 string? parsedValues = parseResult.FindResultFor(_directive)!.Values.SingleOrDefault();
                 string? rawInput = parseResult.CommandLineText;
 
@@ -45,7 +43,7 @@ public override int Invoke(InvocationContext context)
 
                 var completions = completionParseResult.GetCompletions(position);
 
-                context.ParseResult.Configuration.Output.WriteLine(
+                parseResult.Configuration.Output.WriteLine(
                     string.Join(
                         Environment.NewLine,
                         completions));
@@ -53,10 +51,10 @@ public override int Invoke(InvocationContext context)
                 return 0;
             }
 
-            public override Task<int> InvokeAsync(InvocationContext context, CancellationToken cancellationToken = default)
+            public override Task<int> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken = default)
                 => cancellationToken.IsCancellationRequested
                     ? Task.FromCanceled<int>(cancellationToken)
-                    : Task.FromResult(Invoke(context));
+                    : Task.FromResult(Invoke(parseResult));
         }
     }
 }