diff --git a/Then/AssertTaskExtensions.cs b/Then/AssertTaskExtensions.cs
index 8294b39..b839c0d 100644
--- a/Then/AssertTaskExtensions.cs
+++ b/Then/AssertTaskExtensions.cs
@@ -12,6 +12,17 @@ public static async Task<T> Assert<T>( this Task<T> task, Func<T, bool> predicat
 			return result;
 		}
 
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
+		public static async ValueTask<T> Assert<T>(this ValueTask<T> task, Func<T, bool> predicate, Action<T> reaction)
+		{
+			var result = task.IsCompletedSuccessfully ? task.Result : await task.ConfigureAwait( false );
+			if (!predicate(result))
+			{
+				reaction(result);
+			}
+			return result;
+		}
+
 		[MethodImpl( MethodImplOptions.AggressiveInlining )]
 		public static async Task<T> Assert<T, TException>( this Task<T> task, Func<T, bool> predicate, Func<T, TException> reaction ) where TException : Exception
 		{
@@ -21,5 +32,16 @@ public static async Task<T> Assert<T, TException>( this Task<T> task, Func<T, bo
 			}
 			return result;
 		}
+
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
+		public static async ValueTask<T> Assert<T, TException>(this ValueTask<T> task, Func<T, bool> predicate, Func<T, TException> reaction) where TException : Exception
+		{
+			var result = task.IsCompletedSuccessfully ? task.Result : await task.ConfigureAwait( false );
+			if (!predicate(result))
+			{
+				throw reaction(result);
+			}
+			return result;
+		}
 	}
 }
\ No newline at end of file
diff --git a/Then/CatchTaskExtensions.cs b/Then/CatchTaskExtensions.cs
index 467f159..a9c6749 100644
--- a/Then/CatchTaskExtensions.cs
+++ b/Then/CatchTaskExtensions.cs
@@ -38,6 +38,18 @@ public static async Task<T> Catch<T, TException>( this Task<T> task, Func<TExcep
 			}
 		}
 
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
+		public static async ValueTask<T> Catch<T, TException>(this ValueTask<T> task, Func<TException, T> exceptionHandler) where TException : Exception
+		{
+			try {
+				return task.IsCompletedSuccessfully ? task.Result : await task.ConfigureAwait( false );
+			}
+			catch (TException e)
+			{
+				return exceptionHandler(e);
+			}
+		}
+
 		[MethodImpl( MethodImplOptions.AggressiveInlining )]
 		public static Task Catch( this Task task, Action<Exception> exceptionHandler ) => task.Catch<Exception>( exceptionHandler );
 
diff --git a/Then/TapTaskExtensions.cs b/Then/TapTaskExtensions.cs
index e34126b..9a02dc8 100644
--- a/Then/TapTaskExtensions.cs
+++ b/Then/TapTaskExtensions.cs
@@ -10,6 +10,14 @@ public static async Task<T> Tap<T>( this Task<T> task, Func<Task> then )
 			return result;
 		}
 
+		[MethodImpl( MethodImplOptions.AggressiveInlining )]
+		public static async ValueTask<T> Tap<T>( this ValueTask<T> task, Func<Task> then )
+		{
+			var result = task.IsCompletedSuccessfully ? task.Result : await task.ConfigureAwait( false );
+			await then().ConfigureAwait( false );
+			return result;
+		}
+
 		[MethodImpl( MethodImplOptions.AggressiveInlining )]
 		public static async Task<T> Tap<T>( this Task<T> task, Action<T> then )
 		{
@@ -18,12 +26,28 @@ public static async Task<T> Tap<T>( this Task<T> task, Action<T> then )
 			return result;
 		}
 
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
+		public static async ValueTask<T> Tap<T>(this ValueTask<T> task, Action<T> then)
+		{
+			var result = task.IsCompletedSuccessfully ? task.Result : await task.ConfigureAwait(false);
+			then(result);
+			return result;
+		}
+
 		[MethodImpl( MethodImplOptions.AggressiveInlining )]
 		public static async Task<T> Tap<T>( this Task<T> task, Action then )
 		{
 			var result = await task.ConfigureAwait( false );
 			then();
 			return result;
+		}
+
+		[MethodImpl( MethodImplOptions.AggressiveInlining )]
+		public static async ValueTask<T> Tap<T>( this ValueTask<T> task, Action then )
+		{
+			var result = task.IsCompletedSuccessfully ? task.Result : await task.ConfigureAwait( false );
+			then();
+			return result;
 		}
 
 		[MethodImpl( MethodImplOptions.AggressiveInlining )]
@@ -40,5 +64,13 @@ public static async Task<T> Tap<T>( this Task<T> task, Func<T, Task> then )
 			await then( result ).ConfigureAwait( false );
 			return result;
 		}
+
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
+		public static async ValueTask<T> Tap<T>(this ValueTask<T> task, Func<T, Task> then)
+		{
+			var result = task.IsCompletedSuccessfully ? task.Result : await task.ConfigureAwait(false);
+			await then(result).ConfigureAwait(false);
+			return result;
+		}
 	}
 }
\ No newline at end of file
diff --git a/Then/Then.csproj b/Then/Then.csproj
index 1215c9e..67fcefb 100644
--- a/Then/Then.csproj
+++ b/Then/Then.csproj
@@ -19,4 +19,8 @@
     <Version>1.0.3</Version>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.4.0" />
+  </ItemGroup>
+
 </Project>
diff --git a/Then/ThenTaskExtensions.cs b/Then/ThenTaskExtensions.cs
index 2e10f74..0453374 100644
--- a/Then/ThenTaskExtensions.cs
+++ b/Then/ThenTaskExtensions.cs
@@ -10,6 +10,13 @@ public static async Task<TResult> Then<T, TResult>( this Task<T> task, Func<T, F
 			return selector( result ).Invoke();
 		}
 
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
+		public static async ValueTask<TResult> Then<T, TResult>(this ValueTask<T> task, Func<T, Func<TResult>> selector)
+		{
+			var result = task.IsCompletedSuccessfully ? task.Result : await task.ConfigureAwait( false );
+			return selector(result).Invoke();
+		}
+
 		[MethodImpl( MethodImplOptions.AggressiveInlining )]
 		public static async Task<TResult> Then<T, TResult>( this Task<T> task, Func<T, Func<Task<TResult>>> selector )
 		{
@@ -17,6 +24,15 @@ public static async Task<TResult> Then<T, TResult>( this Task<T> task, Func<T, F
 			return await selector( result ).Invoke().ConfigureAwait( false );
 		}
 
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
+		public static async ValueTask<TResult> Then<T, TResult>(this ValueTask<T> task, Func<T, Func<ValueTask<TResult>>> selector)
+		{
+			var result = task.IsCompletedSuccessfully ? task.Result : await task.ConfigureAwait(false);
+
+			var selectorTask = selector( result ).Invoke();
+			return selectorTask.IsCompletedSuccessfully ? selectorTask.Result : await selectorTask.ConfigureAwait( false );
+		}
+
 		[MethodImpl( MethodImplOptions.AggressiveInlining )]
 		public static async Task<TResult> Then<T, TResult>( this Task<T> task, Func<T, TResult> then )
 		{
@@ -24,6 +40,13 @@ public static async Task<TResult> Then<T, TResult>( this Task<T> task, Func<T, T
 			return then( result );
 		}
 
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
+		public static async ValueTask<TResult> Then<T, TResult>(this ValueTask<T> task, Func<T, TResult> then)
+		{
+			var result = task.IsCompletedSuccessfully ? task.Result : await task.ConfigureAwait(false);
+			return then(result);
+		}
+
 		[MethodImpl( MethodImplOptions.AggressiveInlining )]
 		public static async Task<TResult> Then<T, TResult>( this Task<T> task, Func<T, Task<TResult>> then )
 		{
@@ -31,6 +54,14 @@ public static async Task<TResult> Then<T, TResult>( this Task<T> task, Func<T, T
 			return await then( result ).ConfigureAwait( false );
 		}
 
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
+		public static async ValueTask<TResult> Then<T, TResult>(this ValueTask<T> task, Func<T, ValueTask<TResult>> then)
+		{
+			var result = task.IsCompletedSuccessfully ? task.Result : await task.ConfigureAwait(false);
+			var thenTask = then( result );
+			return thenTask.IsCompletedSuccessfully ? thenTask.Result : await thenTask.ConfigureAwait( false );
+		}
+
 		[MethodImpl( MethodImplOptions.AggressiveInlining )]
 		public static async Task Then<T>( this Task<T> task, Func<T, Task> then )
 		{