diff --git a/GFramework.Cqrs.Tests/Cqrs/CqrsDispatcherCacheTests.cs b/GFramework.Cqrs.Tests/Cqrs/CqrsDispatcherCacheTests.cs
index 470667ec..ee8c549a 100644
--- a/GFramework.Cqrs.Tests/Cqrs/CqrsDispatcherCacheTests.cs
+++ b/GFramework.Cqrs.Tests/Cqrs/CqrsDispatcherCacheTests.cs
@@ -224,124 +224,8 @@ internal sealed class CqrsDispatcherCacheTests
     /// </summary>
     private static async Task DrainAsync<T>(IAsyncEnumerable<T> stream)
     {
-        await foreach (var _ in stream)
+        await foreach (var _ in stream.ConfigureAwait(false))
         {
         }
     }
 }
-
-/// <summary>
-///     用于验证 request 服务类型缓存的测试请求。
-/// </summary>
-internal sealed record DispatcherCacheRequest : IRequest<int>;
-
-/// <summary>
-///     用于验证 notification 服务类型缓存的测试通知。
-/// </summary>
-internal sealed record DispatcherCacheNotification : INotification;
-
-/// <summary>
-///     用于验证 stream 服务类型缓存的测试请求。
-/// </summary>
-internal sealed record DispatcherCacheStreamRequest : IStreamRequest<int>;
-
-/// <summary>
-///     用于验证 pipeline invoker 缓存的测试请求。
-/// </summary>
-internal sealed record DispatcherPipelineCacheRequest : IRequest<int>;
-
-/// <summary>
-///     用于验证按响应类型分层 request invoker 缓存的测试请求。
-/// </summary>
-internal sealed record DispatcherStringCacheRequest : IRequest<string>;
-
-/// <summary>
-///     处理 <see cref="DispatcherCacheRequest" />。
-/// </summary>
-internal sealed class DispatcherCacheRequestHandler : IRequestHandler<DispatcherCacheRequest, int>
-{
-    /// <summary>
-    ///     返回固定结果，供缓存测试验证 dispatcher 请求路径。
-    /// </summary>
-    public ValueTask<int> Handle(DispatcherCacheRequest request, CancellationToken cancellationToken)
-    {
-        return ValueTask.FromResult(1);
-    }
-}
-
-/// <summary>
-///     处理 <see cref="DispatcherCacheNotification" />。
-/// </summary>
-internal sealed class DispatcherCacheNotificationHandler : INotificationHandler<DispatcherCacheNotification>
-{
-    /// <summary>
-    ///     消费通知，不执行额外副作用。
-    /// </summary>
-    public ValueTask Handle(DispatcherCacheNotification notification, CancellationToken cancellationToken)
-    {
-        return ValueTask.CompletedTask;
-    }
-}
-
-/// <summary>
-///     处理 <see cref="DispatcherCacheStreamRequest" />。
-/// </summary>
-internal sealed class DispatcherCacheStreamHandler : IStreamRequestHandler<DispatcherCacheStreamRequest, int>
-{
-    /// <summary>
-    ///     返回一个最小流，供缓存测试命中 stream 分发路径。
-    /// </summary>
-    public async IAsyncEnumerable<int> Handle(
-        DispatcherCacheStreamRequest request,
-        [EnumeratorCancellation] CancellationToken cancellationToken)
-    {
-        yield return 1;
-        await Task.CompletedTask;
-    }
-}
-
-/// <summary>
-///     处理 <see cref="DispatcherPipelineCacheRequest" />。
-/// </summary>
-internal sealed class DispatcherPipelineCacheRequestHandler : IRequestHandler<DispatcherPipelineCacheRequest, int>
-{
-    /// <summary>
-    ///     返回固定结果，供 pipeline 缓存测试使用。
-    /// </summary>
-    public ValueTask<int> Handle(DispatcherPipelineCacheRequest request, CancellationToken cancellationToken)
-    {
-        return ValueTask.FromResult(2);
-    }
-}
-
-/// <summary>
-///     处理 <see cref="DispatcherStringCacheRequest" />。
-/// </summary>
-internal sealed class DispatcherStringCacheRequestHandler : IRequestHandler<DispatcherStringCacheRequest, string>
-{
-    /// <summary>
-    ///     返回固定字符串，供按响应类型缓存测试验证 string 路径。
-    /// </summary>
-    public ValueTask<string> Handle(DispatcherStringCacheRequest request, CancellationToken cancellationToken)
-    {
-        return ValueTask.FromResult("dispatcher-cache");
-    }
-}
-
-/// <summary>
-///     为 <see cref="DispatcherPipelineCacheRequest" /> 提供最小 pipeline 行为，
-///     用于命中 dispatcher 的 pipeline invoker 缓存分支。
-/// </summary>
-internal sealed class DispatcherPipelineCacheBehavior : IPipelineBehavior<DispatcherPipelineCacheRequest, int>
-{
-    /// <summary>
-    ///     直接转发到下一个处理器。
-    /// </summary>
-    public ValueTask<int> Handle(
-        DispatcherPipelineCacheRequest request,
-        MessageHandlerDelegate<DispatcherPipelineCacheRequest, int> next,
-        CancellationToken cancellationToken)
-    {
-        return next(request, cancellationToken);
-    }
-}
diff --git a/GFramework.Cqrs.Tests/Cqrs/DispatcherCacheNotification.cs b/GFramework.Cqrs.Tests/Cqrs/DispatcherCacheNotification.cs
new file mode 100644
index 00000000..00a2535c
--- /dev/null
+++ b/GFramework.Cqrs.Tests/Cqrs/DispatcherCacheNotification.cs
@@ -0,0 +1,8 @@
+using GFramework.Cqrs.Abstractions.Cqrs;
+
+namespace GFramework.Cqrs.Tests.Cqrs;
+
+/// <summary>
+///     用于验证 notification 服务类型缓存的测试通知。
+/// </summary>
+internal sealed record DispatcherCacheNotification : INotification;
diff --git a/GFramework.Cqrs.Tests/Cqrs/DispatcherCacheNotificationHandler.cs b/GFramework.Cqrs.Tests/Cqrs/DispatcherCacheNotificationHandler.cs
new file mode 100644
index 00000000..b023398a
--- /dev/null
+++ b/GFramework.Cqrs.Tests/Cqrs/DispatcherCacheNotificationHandler.cs
@@ -0,0 +1,21 @@
+using System.Threading;
+using GFramework.Cqrs.Abstractions.Cqrs;
+
+namespace GFramework.Cqrs.Tests.Cqrs;
+
+/// <summary>
+///     处理 <see cref="DispatcherCacheNotification" />。
+/// </summary>
+internal sealed class DispatcherCacheNotificationHandler : INotificationHandler<DispatcherCacheNotification>
+{
+    /// <summary>
+    ///     消费通知，不执行额外副作用。
+    /// </summary>
+    /// <param name="notification">当前通知。</param>
+    /// <param name="cancellationToken">取消令牌。</param>
+    /// <returns>已完成任务。</returns>
+    public ValueTask Handle(DispatcherCacheNotification notification, CancellationToken cancellationToken)
+    {
+        return ValueTask.CompletedTask;
+    }
+}
diff --git a/GFramework.Cqrs.Tests/Cqrs/DispatcherCacheRequest.cs b/GFramework.Cqrs.Tests/Cqrs/DispatcherCacheRequest.cs
new file mode 100644
index 00000000..005b06d0
--- /dev/null
+++ b/GFramework.Cqrs.Tests/Cqrs/DispatcherCacheRequest.cs
@@ -0,0 +1,8 @@
+using GFramework.Cqrs.Abstractions.Cqrs;
+
+namespace GFramework.Cqrs.Tests.Cqrs;
+
+/// <summary>
+///     用于验证 request 服务类型缓存的测试请求。
+/// </summary>
+internal sealed record DispatcherCacheRequest : IRequest<int>;
diff --git a/GFramework.Cqrs.Tests/Cqrs/DispatcherCacheRequestHandler.cs b/GFramework.Cqrs.Tests/Cqrs/DispatcherCacheRequestHandler.cs
new file mode 100644
index 00000000..acd1f043
--- /dev/null
+++ b/GFramework.Cqrs.Tests/Cqrs/DispatcherCacheRequestHandler.cs
@@ -0,0 +1,21 @@
+using System.Threading;
+using GFramework.Cqrs.Abstractions.Cqrs;
+
+namespace GFramework.Cqrs.Tests.Cqrs;
+
+/// <summary>
+///     处理 <see cref="DispatcherCacheRequest" />。
+/// </summary>
+internal sealed class DispatcherCacheRequestHandler : IRequestHandler<DispatcherCacheRequest, int>
+{
+    /// <summary>
+    ///     返回固定结果，供缓存测试验证 dispatcher 请求路径。
+    /// </summary>
+    /// <param name="request">当前请求。</param>
+    /// <param name="cancellationToken">取消令牌。</param>
+    /// <returns>固定整数结果。</returns>
+    public ValueTask<int> Handle(DispatcherCacheRequest request, CancellationToken cancellationToken)
+    {
+        return ValueTask.FromResult(1);
+    }
+}
diff --git a/GFramework.Cqrs.Tests/Cqrs/DispatcherCacheStreamHandler.cs b/GFramework.Cqrs.Tests/Cqrs/DispatcherCacheStreamHandler.cs
new file mode 100644
index 00000000..476cbe43
--- /dev/null
+++ b/GFramework.Cqrs.Tests/Cqrs/DispatcherCacheStreamHandler.cs
@@ -0,0 +1,27 @@
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using GFramework.Cqrs.Abstractions.Cqrs;
+
+namespace GFramework.Cqrs.Tests.Cqrs;
+
+/// <summary>
+///     处理 <see cref="DispatcherCacheStreamRequest" />。
+/// </summary>
+internal sealed class DispatcherCacheStreamHandler : IStreamRequestHandler<DispatcherCacheStreamRequest, int>
+{
+    /// <summary>
+    ///     返回一个最小流，供缓存测试命中 stream 分发路径。
+    /// </summary>
+    /// <param name="request">当前流请求。</param>
+    /// <param name="cancellationToken">取消令牌。</param>
+    /// <returns>包含一个固定元素的异步流。</returns>
+    public async IAsyncEnumerable<int> Handle(
+        DispatcherCacheStreamRequest request,
+        [EnumeratorCancellation] CancellationToken cancellationToken)
+    {
+        yield return 1;
+        await Task.CompletedTask.ConfigureAwait(false);
+    }
+}
diff --git a/GFramework.Cqrs.Tests/Cqrs/DispatcherCacheStreamRequest.cs b/GFramework.Cqrs.Tests/Cqrs/DispatcherCacheStreamRequest.cs
new file mode 100644
index 00000000..e09b23cb
--- /dev/null
+++ b/GFramework.Cqrs.Tests/Cqrs/DispatcherCacheStreamRequest.cs
@@ -0,0 +1,8 @@
+using GFramework.Cqrs.Abstractions.Cqrs;
+
+namespace GFramework.Cqrs.Tests.Cqrs;
+
+/// <summary>
+///     用于验证 stream 服务类型缓存的测试请求。
+/// </summary>
+internal sealed record DispatcherCacheStreamRequest : IStreamRequest<int>;
diff --git a/GFramework.Cqrs.Tests/Cqrs/DispatcherPipelineCacheBehavior.cs b/GFramework.Cqrs.Tests/Cqrs/DispatcherPipelineCacheBehavior.cs
new file mode 100644
index 00000000..7335616c
--- /dev/null
+++ b/GFramework.Cqrs.Tests/Cqrs/DispatcherPipelineCacheBehavior.cs
@@ -0,0 +1,26 @@
+using System.Threading;
+using GFramework.Cqrs.Abstractions.Cqrs;
+
+namespace GFramework.Cqrs.Tests.Cqrs;
+
+/// <summary>
+///     为 <see cref="DispatcherPipelineCacheRequest" /> 提供最小 pipeline 行为，
+///     用于命中 dispatcher 的 pipeline invoker 缓存分支。
+/// </summary>
+internal sealed class DispatcherPipelineCacheBehavior : IPipelineBehavior<DispatcherPipelineCacheRequest, int>
+{
+    /// <summary>
+    ///     直接转发到下一个处理器。
+    /// </summary>
+    /// <param name="request">当前请求。</param>
+    /// <param name="next">下一个处理器委托。</param>
+    /// <param name="cancellationToken">取消令牌。</param>
+    /// <returns>下游处理器结果。</returns>
+    public ValueTask<int> Handle(
+        DispatcherPipelineCacheRequest request,
+        MessageHandlerDelegate<DispatcherPipelineCacheRequest, int> next,
+        CancellationToken cancellationToken)
+    {
+        return next(request, cancellationToken);
+    }
+}
diff --git a/GFramework.Cqrs.Tests/Cqrs/DispatcherPipelineCacheRequest.cs b/GFramework.Cqrs.Tests/Cqrs/DispatcherPipelineCacheRequest.cs
new file mode 100644
index 00000000..53cd733d
--- /dev/null
+++ b/GFramework.Cqrs.Tests/Cqrs/DispatcherPipelineCacheRequest.cs
@@ -0,0 +1,8 @@
+using GFramework.Cqrs.Abstractions.Cqrs;
+
+namespace GFramework.Cqrs.Tests.Cqrs;
+
+/// <summary>
+///     用于验证 pipeline invoker 缓存的测试请求。
+/// </summary>
+internal sealed record DispatcherPipelineCacheRequest : IRequest<int>;
diff --git a/GFramework.Cqrs.Tests/Cqrs/DispatcherPipelineCacheRequestHandler.cs b/GFramework.Cqrs.Tests/Cqrs/DispatcherPipelineCacheRequestHandler.cs
new file mode 100644
index 00000000..d52636a1
--- /dev/null
+++ b/GFramework.Cqrs.Tests/Cqrs/DispatcherPipelineCacheRequestHandler.cs
@@ -0,0 +1,21 @@
+using System.Threading;
+using GFramework.Cqrs.Abstractions.Cqrs;
+
+namespace GFramework.Cqrs.Tests.Cqrs;
+
+/// <summary>
+///     处理 <see cref="DispatcherPipelineCacheRequest" />。
+/// </summary>
+internal sealed class DispatcherPipelineCacheRequestHandler : IRequestHandler<DispatcherPipelineCacheRequest, int>
+{
+    /// <summary>
+    ///     返回固定结果，供 pipeline 缓存测试使用。
+    /// </summary>
+    /// <param name="request">当前请求。</param>
+    /// <param name="cancellationToken">取消令牌。</param>
+    /// <returns>固定整数结果。</returns>
+    public ValueTask<int> Handle(DispatcherPipelineCacheRequest request, CancellationToken cancellationToken)
+    {
+        return ValueTask.FromResult(2);
+    }
+}
diff --git a/GFramework.Cqrs.Tests/Cqrs/DispatcherStringCacheRequest.cs b/GFramework.Cqrs.Tests/Cqrs/DispatcherStringCacheRequest.cs
new file mode 100644
index 00000000..65821391
--- /dev/null
+++ b/GFramework.Cqrs.Tests/Cqrs/DispatcherStringCacheRequest.cs
@@ -0,0 +1,8 @@
+using GFramework.Cqrs.Abstractions.Cqrs;
+
+namespace GFramework.Cqrs.Tests.Cqrs;
+
+/// <summary>
+///     用于验证按响应类型分层 request invoker 缓存的测试请求。
+/// </summary>
+internal sealed record DispatcherStringCacheRequest : IRequest<string>;
diff --git a/GFramework.Cqrs.Tests/Cqrs/DispatcherStringCacheRequestHandler.cs b/GFramework.Cqrs.Tests/Cqrs/DispatcherStringCacheRequestHandler.cs
new file mode 100644
index 00000000..83082053
--- /dev/null
+++ b/GFramework.Cqrs.Tests/Cqrs/DispatcherStringCacheRequestHandler.cs
@@ -0,0 +1,21 @@
+using System.Threading;
+using GFramework.Cqrs.Abstractions.Cqrs;
+
+namespace GFramework.Cqrs.Tests.Cqrs;
+
+/// <summary>
+///     处理 <see cref="DispatcherStringCacheRequest" />。
+/// </summary>
+internal sealed class DispatcherStringCacheRequestHandler : IRequestHandler<DispatcherStringCacheRequest, string>
+{
+    /// <summary>
+    ///     返回固定字符串，供按响应类型缓存测试验证 string 路径。
+    /// </summary>
+    /// <param name="request">当前请求。</param>
+    /// <param name="cancellationToken">取消令牌。</param>
+    /// <returns>固定字符串结果。</returns>
+    public ValueTask<string> Handle(DispatcherStringCacheRequest request, CancellationToken cancellationToken)
+    {
+        return ValueTask.FromResult("dispatcher-cache");
+    }
+}