diff --git a/Benchmarking/NuGet.Config b/Benchmarking/NuGet.Config
deleted file mode 100644
index 3bb8cd5..0000000
--- a/Benchmarking/NuGet.Config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-    <add key="local" value="..\GeneratedNuGetPackages\"/>
-  </packageSources>
-</configuration>
\ No newline at end of file
diff --git a/CapnpCompatTest/CapnpCompatTest.vcxproj b/CapnpCompatTest/CapnpCompatTest.vcxproj
index 82cc32f..d7edd2e 100644
--- a/CapnpCompatTest/CapnpCompatTest.vcxproj
+++ b/CapnpCompatTest/CapnpCompatTest.vcxproj
@@ -97,6 +97,12 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>ws2_32.lib;capnp.lib;capnp-rpc.lib;kj.lib;kj-async.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
+    <PreBuildEvent>
+      <Command>capnp compile -oc++ test.capnp</Command>
+    </PreBuildEvent>
+    <PreBuildEvent>
+      <Message>re-compile test.capnp</Message>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -112,6 +118,12 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
+    <PreBuildEvent>
+      <Command>capnp compile -oc++ test.capnp</Command>
+    </PreBuildEvent>
+    <PreBuildEvent>
+      <Message>re-compile test.capnp</Message>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -132,6 +144,12 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>ws2_32.lib;capnp.lib;capnp-rpc.lib;kj.lib;kj-async.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
+    <PreBuildEvent>
+      <Command>capnp compile -oc++ test.capnp</Command>
+    </PreBuildEvent>
+    <PreBuildEvent>
+      <Message>re-compile test.capnp</Message>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
@@ -151,6 +169,12 @@
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
+    <PreBuildEvent>
+      <Command>capnp compile -oc++ test.capnp</Command>
+    </PreBuildEvent>
+    <PreBuildEvent>
+      <Message>re-compile test.capnp</Message>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="CapnpCompatTest.cpp" />
diff --git a/CapnpCompatTest/CapnpCompatTest.vcxproj.filters b/CapnpCompatTest/CapnpCompatTest.vcxproj.filters
index c3136b5..64d3d18 100644
--- a/CapnpCompatTest/CapnpCompatTest.vcxproj.filters
+++ b/CapnpCompatTest/CapnpCompatTest.vcxproj.filters
@@ -21,14 +21,12 @@
     <ClCompile Include="CapnpCompatTest.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
+    <ClCompile Include="test.capnp.c++" />
   </ItemGroup>
   <ItemGroup>
     <None Include="test.capnp">
       <Filter>Schema</Filter>
     </None>
-    <None Include="test.capnp.c++">
-      <Filter>Schema</Filter>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="test.capnp.h">
diff --git a/CapnpCompatTest/test.capnp.c++ b/CapnpCompatTest/test.capnp.c++
index 6a0808e..b74ae82 100644
--- a/CapnpCompatTest/test.capnp.c++
+++ b/CapnpCompatTest/test.capnp.c++
@@ -11914,7 +11914,7 @@ static const ::capnp::_::AlignedData<553> b_8e59556fb309253f = {
       0,   0,   0,   0,   0,   0,   0,   0,
      12,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
-      1,   0,   0,   0,  98, 132,   0,   0,
+      1,   0,   0,   0, 106, 132,   0,   0,
      40, 118, 111, 105, 100,  70, 105, 101,
     108, 100,  32,  61,  32, 118, 111, 105,
     100,  44,  32,  98, 111, 111, 108,  70,
@@ -12444,7 +12444,7 @@ static const ::capnp::_::AlignedData<553> b_8e59556fb309253f = {
      32, 101, 110, 117, 109,  76, 105, 115,
     116,  32,  61,  32,  91, 102, 111, 111,
      44,  32, 103,  97, 114, 112, 108, 121,
-     93,  41,  10,   0,   0,   0,   0,   0, }
+     93,  41,  13,  10,   0,   0,   0,   0, }
 };
 ::capnp::word const* const bp_8e59556fb309253f = b_8e59556fb309253f.words;
 #if !CAPNP_LITE
@@ -18930,7 +18930,7 @@ constexpr ::capnp::_::RawSchema const* TestGenericsWrapper2::_capnpPrivate::sche
       "test.capnp:TestImplicitMethodParams", "call",
       0x8b9717a3f8d85a9aull, 0);
 }
-::kj::Promise<void> TestImplicitMethodParams::Server::dispatchCall(
+::capnp::Capability::Server::DispatchCallResult TestImplicitMethodParams::Server::dispatchCall(
     uint64_t interfaceId, uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (interfaceId) {
@@ -18940,13 +18940,16 @@ constexpr ::capnp::_::RawSchema const* TestGenericsWrapper2::_capnpPrivate::sche
       return internalUnimplemented("test.capnp:TestImplicitMethodParams", interfaceId);
   }
 }
-::kj::Promise<void> TestImplicitMethodParams::Server::dispatchCallInternal(
+::capnp::Capability::Server::DispatchCallResult TestImplicitMethodParams::Server::dispatchCallInternal(
     uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (methodId) {
     case 0:
-      return call(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestImplicitMethodParams::CallParams<>,  ::capnproto_test::capnp::test::TestGenerics< ::capnp::AnyPointer,  ::capnp::AnyPointer>>(context));
+      return {
+        call(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestImplicitMethodParams::CallParams<>,  ::capnproto_test::capnp::test::TestGenerics< ::capnp::AnyPointer,  ::capnp::AnyPointer>>(context)),
+        false
+      };
     default:
       (void)context;
       return ::capnp::Capability::Server::internalUnimplemented(
@@ -19044,7 +19047,7 @@ const ::capnp::_::ConstStruct< ::capnproto_test::capnp::test::TestPrintInlineStr
 const ::capnp::_::ConstStruct< ::capnproto_test::capnp::test::TestAllTypes> DERIVED_CONSTANT(::capnp::schemas::b_a4764c3483341eeb.words + 23);
 const ::capnp::_::ConstStruct< ::capnproto_test::capnp::test::TestGenerics< ::capnproto_test::capnp::test::TestAllTypes,  ::capnp::Text>> GENERIC_CONSTANT(::capnp::schemas::b_b70341f0dafa28ef.words + 41);
 const ::capnp::_::ConstData<831> EMBEDDED_DATA(::capnp::schemas::b_d7c0fea759d6a0cf.words + 23);
-const ::capnp::_::ConstText<4235> EMBEDDED_TEXT(::capnp::schemas::b_8e59556fb309253f.words + 23);
+const ::capnp::_::ConstText<4236> EMBEDDED_TEXT(::capnp::schemas::b_8e59556fb309253f.words + 23);
 const ::capnp::_::ConstStruct< ::capnproto_test::capnp::test::TestAllTypes> EMBEDDED_STRUCT(::capnp::schemas::b_dec09c6791841ebb.words + 23);
 const ::capnp::_::ConstText<10> NON_ASCII_TEXT(::capnp::schemas::b_fb7ed666617fb649.words + 23);
 // TestAnyPointerConstants
@@ -19087,7 +19090,7 @@ TestInterface::Client::bazRequest(::kj::Maybe< ::capnp::MessageSize> sizeHint) {
       "test.capnp:TestInterface", "baz",
       0x88eb12a0e0af92b2ull, 2);
 }
-::kj::Promise<void> TestInterface::Server::dispatchCall(
+::capnp::Capability::Server::DispatchCallResult TestInterface::Server::dispatchCall(
     uint64_t interfaceId, uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (interfaceId) {
@@ -19097,19 +19100,28 @@ TestInterface::Client::bazRequest(::kj::Maybe< ::capnp::MessageSize> sizeHint) {
       return internalUnimplemented("test.capnp:TestInterface", interfaceId);
   }
 }
-::kj::Promise<void> TestInterface::Server::dispatchCallInternal(
+::capnp::Capability::Server::DispatchCallResult TestInterface::Server::dispatchCallInternal(
     uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (methodId) {
     case 0:
-      return foo(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestInterface::FooParams,  ::capnproto_test::capnp::test::TestInterface::FooResults>(context));
+      return {
+        foo(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestInterface::FooParams,  ::capnproto_test::capnp::test::TestInterface::FooResults>(context)),
+        false
+      };
     case 1:
-      return bar(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestInterface::BarParams,  ::capnproto_test::capnp::test::TestInterface::BarResults>(context));
+      return {
+        bar(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestInterface::BarParams,  ::capnproto_test::capnp::test::TestInterface::BarResults>(context)),
+        false
+      };
     case 2:
-      return baz(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestInterface::BazParams,  ::capnproto_test::capnp::test::TestInterface::BazResults>(context));
+      return {
+        baz(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestInterface::BazParams,  ::capnproto_test::capnp::test::TestInterface::BazResults>(context)),
+        false
+      };
     default:
       (void)context;
       return ::capnp::Capability::Server::internalUnimplemented(
@@ -19204,7 +19216,7 @@ TestExtends::Client::graultRequest(::kj::Maybe< ::capnp::MessageSize> sizeHint)
       "test.capnp:TestExtends", "grault",
       0xe4e9bac98670b748ull, 2);
 }
-::kj::Promise<void> TestExtends::Server::dispatchCall(
+::capnp::Capability::Server::DispatchCallResult TestExtends::Server::dispatchCall(
     uint64_t interfaceId, uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (interfaceId) {
@@ -19216,19 +19228,28 @@ TestExtends::Client::graultRequest(::kj::Maybe< ::capnp::MessageSize> sizeHint)
       return internalUnimplemented("test.capnp:TestExtends", interfaceId);
   }
 }
-::kj::Promise<void> TestExtends::Server::dispatchCallInternal(
+::capnp::Capability::Server::DispatchCallResult TestExtends::Server::dispatchCallInternal(
     uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (methodId) {
     case 0:
-      return qux(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestExtends::QuxParams,  ::capnproto_test::capnp::test::TestExtends::QuxResults>(context));
+      return {
+        qux(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestExtends::QuxParams,  ::capnproto_test::capnp::test::TestExtends::QuxResults>(context)),
+        false
+      };
     case 1:
-      return corge(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestAllTypes,  ::capnproto_test::capnp::test::TestExtends::CorgeResults>(context));
+      return {
+        corge(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestAllTypes,  ::capnproto_test::capnp::test::TestExtends::CorgeResults>(context)),
+        false
+      };
     case 2:
-      return grault(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestExtends::GraultParams,  ::capnproto_test::capnp::test::TestAllTypes>(context));
+      return {
+        grault(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestExtends::GraultParams,  ::capnproto_test::capnp::test::TestAllTypes>(context)),
+        false
+      };
     default:
       (void)context;
       return ::capnp::Capability::Server::internalUnimplemented(
@@ -19277,7 +19298,7 @@ constexpr ::capnp::_::RawSchema const* TestExtends::GraultParams::_capnpPrivate:
 #endif  // !CAPNP_LITE
 
 #if !CAPNP_LITE
-::kj::Promise<void> TestExtends2::Server::dispatchCall(
+::capnp::Capability::Server::DispatchCallResult TestExtends2::Server::dispatchCall(
     uint64_t interfaceId, uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (interfaceId) {
@@ -19291,7 +19312,7 @@ constexpr ::capnp::_::RawSchema const* TestExtends::GraultParams::_capnpPrivate:
       return internalUnimplemented("test.capnp:TestExtends2", interfaceId);
   }
 }
-::kj::Promise<void> TestExtends2::Server::dispatchCallInternal(
+::capnp::Capability::Server::DispatchCallResult TestExtends2::Server::dispatchCallInternal(
     uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (methodId) {
@@ -19341,7 +19362,7 @@ TestPipeline::Client::getAnyCapRequest(::kj::Maybe< ::capnp::MessageSize> sizeHi
       "test.capnp:TestPipeline", "getAnyCap",
       0xa5a404caa61d4cd0ull, 2);
 }
-::kj::Promise<void> TestPipeline::Server::dispatchCall(
+::capnp::Capability::Server::DispatchCallResult TestPipeline::Server::dispatchCall(
     uint64_t interfaceId, uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (interfaceId) {
@@ -19351,19 +19372,28 @@ TestPipeline::Client::getAnyCapRequest(::kj::Maybe< ::capnp::MessageSize> sizeHi
       return internalUnimplemented("test.capnp:TestPipeline", interfaceId);
   }
 }
-::kj::Promise<void> TestPipeline::Server::dispatchCallInternal(
+::capnp::Capability::Server::DispatchCallResult TestPipeline::Server::dispatchCallInternal(
     uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (methodId) {
     case 0:
-      return getCap(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestPipeline::GetCapParams,  ::capnproto_test::capnp::test::TestPipeline::GetCapResults>(context));
+      return {
+        getCap(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestPipeline::GetCapParams,  ::capnproto_test::capnp::test::TestPipeline::GetCapResults>(context)),
+        false
+      };
     case 1:
-      return testPointers(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestPipeline::TestPointersParams,  ::capnproto_test::capnp::test::TestPipeline::TestPointersResults>(context));
+      return {
+        testPointers(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestPipeline::TestPointersParams,  ::capnproto_test::capnp::test::TestPipeline::TestPointersResults>(context)),
+        false
+      };
     case 2:
-      return getAnyCap(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestPipeline::GetAnyCapParams,  ::capnproto_test::capnp::test::TestPipeline::GetAnyCapResults>(context));
+      return {
+        getAnyCap(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestPipeline::GetAnyCapParams,  ::capnproto_test::capnp::test::TestPipeline::GetAnyCapResults>(context)),
+        false
+      };
     default:
       (void)context;
       return ::capnp::Capability::Server::internalUnimplemented(
@@ -19454,7 +19484,7 @@ TestCallOrder::Client::getCallSequenceRequest(::kj::Maybe< ::capnp::MessageSize>
       "test.capnp:TestCallOrder", "getCallSequence",
       0xa0e77035bdff0051ull, 0);
 }
-::kj::Promise<void> TestCallOrder::Server::dispatchCall(
+::capnp::Capability::Server::DispatchCallResult TestCallOrder::Server::dispatchCall(
     uint64_t interfaceId, uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (interfaceId) {
@@ -19464,13 +19494,16 @@ TestCallOrder::Client::getCallSequenceRequest(::kj::Maybe< ::capnp::MessageSize>
       return internalUnimplemented("test.capnp:TestCallOrder", interfaceId);
   }
 }
-::kj::Promise<void> TestCallOrder::Server::dispatchCallInternal(
+::capnp::Capability::Server::DispatchCallResult TestCallOrder::Server::dispatchCallInternal(
     uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (methodId) {
     case 0:
-      return getCallSequence(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestCallOrder::GetCallSequenceParams,  ::capnproto_test::capnp::test::TestCallOrder::GetCallSequenceResults>(context));
+      return {
+        getCallSequence(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestCallOrder::GetCallSequenceParams,  ::capnproto_test::capnp::test::TestCallOrder::GetCallSequenceResults>(context)),
+        false
+      };
     default:
       (void)context;
       return ::capnp::Capability::Server::internalUnimplemented(
@@ -19513,7 +19546,7 @@ TestTailCallee::Client::fooRequest(::kj::Maybe< ::capnp::MessageSize> sizeHint)
       "test.capnp:TestTailCallee", "foo",
       0xddd699207eb8e23bull, 0);
 }
-::kj::Promise<void> TestTailCallee::Server::dispatchCall(
+::capnp::Capability::Server::DispatchCallResult TestTailCallee::Server::dispatchCall(
     uint64_t interfaceId, uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (interfaceId) {
@@ -19523,13 +19556,16 @@ TestTailCallee::Client::fooRequest(::kj::Maybe< ::capnp::MessageSize> sizeHint)
       return internalUnimplemented("test.capnp:TestTailCallee", interfaceId);
   }
 }
-::kj::Promise<void> TestTailCallee::Server::dispatchCallInternal(
+::capnp::Capability::Server::DispatchCallResult TestTailCallee::Server::dispatchCallInternal(
     uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (methodId) {
     case 0:
-      return foo(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestTailCallee::FooParams,  ::capnproto_test::capnp::test::TestTailCallee::TailResult>(context));
+      return {
+        foo(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestTailCallee::FooParams,  ::capnproto_test::capnp::test::TestTailCallee::TailResult>(context)),
+        false
+      };
     default:
       (void)context;
       return ::capnp::Capability::Server::internalUnimplemented(
@@ -19572,7 +19608,7 @@ TestTailCaller::Client::fooRequest(::kj::Maybe< ::capnp::MessageSize> sizeHint)
       "test.capnp:TestTailCaller", "foo",
       0x870bf40110ce3035ull, 0);
 }
-::kj::Promise<void> TestTailCaller::Server::dispatchCall(
+::capnp::Capability::Server::DispatchCallResult TestTailCaller::Server::dispatchCall(
     uint64_t interfaceId, uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (interfaceId) {
@@ -19582,13 +19618,16 @@ TestTailCaller::Client::fooRequest(::kj::Maybe< ::capnp::MessageSize> sizeHint)
       return internalUnimplemented("test.capnp:TestTailCaller", interfaceId);
   }
 }
-::kj::Promise<void> TestTailCaller::Server::dispatchCallInternal(
+::capnp::Capability::Server::DispatchCallResult TestTailCaller::Server::dispatchCallInternal(
     uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (methodId) {
     case 0:
-      return foo(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestTailCaller::FooParams,  ::capnproto_test::capnp::test::TestTailCallee::TailResult>(context));
+      return {
+        foo(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestTailCaller::FooParams,  ::capnproto_test::capnp::test::TestTailCallee::TailResult>(context)),
+        false
+      };
     default:
       (void)context;
       return ::capnp::Capability::Server::internalUnimplemented(
@@ -19613,7 +19652,7 @@ constexpr ::capnp::_::RawSchema const* TestTailCaller::FooParams::_capnpPrivate:
 #endif  // !CAPNP_LITE
 
 #if !CAPNP_LITE
-::kj::Promise<void> TestHandle::Server::dispatchCall(
+::capnp::Capability::Server::DispatchCallResult TestHandle::Server::dispatchCall(
     uint64_t interfaceId, uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (interfaceId) {
@@ -19623,7 +19662,7 @@ constexpr ::capnp::_::RawSchema const* TestTailCaller::FooParams::_capnpPrivate:
       return internalUnimplemented("test.capnp:TestHandle", interfaceId);
   }
 }
-::kj::Promise<void> TestHandle::Server::dispatchCallInternal(
+::capnp::Capability::Server::DispatchCallResult TestHandle::Server::dispatchCallInternal(
     uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (methodId) {
@@ -19773,7 +19812,7 @@ TestMoreStuff::Client::methodWithNullDefaultRequest(::kj::Maybe< ::capnp::Messag
       "test.capnp:TestMoreStuff", "methodWithNullDefault",
       0xddc70bf9784133cfull, 12);
 }
-::kj::Promise<void> TestMoreStuff::Server::dispatchCall(
+::capnp::Capability::Server::DispatchCallResult TestMoreStuff::Server::dispatchCall(
     uint64_t interfaceId, uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (interfaceId) {
@@ -19785,49 +19824,88 @@ TestMoreStuff::Client::methodWithNullDefaultRequest(::kj::Maybe< ::capnp::Messag
       return internalUnimplemented("test.capnp:TestMoreStuff", interfaceId);
   }
 }
-::kj::Promise<void> TestMoreStuff::Server::dispatchCallInternal(
+::capnp::Capability::Server::DispatchCallResult TestMoreStuff::Server::dispatchCallInternal(
     uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (methodId) {
     case 0:
-      return callFoo(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestMoreStuff::CallFooParams,  ::capnproto_test::capnp::test::TestMoreStuff::CallFooResults>(context));
+      return {
+        callFoo(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestMoreStuff::CallFooParams,  ::capnproto_test::capnp::test::TestMoreStuff::CallFooResults>(context)),
+        false
+      };
     case 1:
-      return callFooWhenResolved(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestMoreStuff::CallFooWhenResolvedParams,  ::capnproto_test::capnp::test::TestMoreStuff::CallFooWhenResolvedResults>(context));
+      return {
+        callFooWhenResolved(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestMoreStuff::CallFooWhenResolvedParams,  ::capnproto_test::capnp::test::TestMoreStuff::CallFooWhenResolvedResults>(context)),
+        false
+      };
     case 2:
-      return neverReturn(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestMoreStuff::NeverReturnParams,  ::capnproto_test::capnp::test::TestMoreStuff::NeverReturnResults>(context));
+      return {
+        neverReturn(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestMoreStuff::NeverReturnParams,  ::capnproto_test::capnp::test::TestMoreStuff::NeverReturnResults>(context)),
+        false
+      };
     case 3:
-      return hold(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestMoreStuff::HoldParams,  ::capnproto_test::capnp::test::TestMoreStuff::HoldResults>(context));
+      return {
+        hold(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestMoreStuff::HoldParams,  ::capnproto_test::capnp::test::TestMoreStuff::HoldResults>(context)),
+        false
+      };
     case 4:
-      return callHeld(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestMoreStuff::CallHeldParams,  ::capnproto_test::capnp::test::TestMoreStuff::CallHeldResults>(context));
+      return {
+        callHeld(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestMoreStuff::CallHeldParams,  ::capnproto_test::capnp::test::TestMoreStuff::CallHeldResults>(context)),
+        false
+      };
     case 5:
-      return getHeld(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestMoreStuff::GetHeldParams,  ::capnproto_test::capnp::test::TestMoreStuff::GetHeldResults>(context));
+      return {
+        getHeld(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestMoreStuff::GetHeldParams,  ::capnproto_test::capnp::test::TestMoreStuff::GetHeldResults>(context)),
+        false
+      };
     case 6:
-      return echo(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestMoreStuff::EchoParams,  ::capnproto_test::capnp::test::TestMoreStuff::EchoResults>(context));
+      return {
+        echo(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestMoreStuff::EchoParams,  ::capnproto_test::capnp::test::TestMoreStuff::EchoResults>(context)),
+        false
+      };
     case 7:
-      return expectCancel(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestMoreStuff::ExpectCancelParams,  ::capnproto_test::capnp::test::TestMoreStuff::ExpectCancelResults>(context));
+      return {
+        expectCancel(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestMoreStuff::ExpectCancelParams,  ::capnproto_test::capnp::test::TestMoreStuff::ExpectCancelResults>(context)),
+        false
+      };
     case 8:
-      return methodWithDefaults(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestMoreStuff::MethodWithDefaultsParams,  ::capnproto_test::capnp::test::TestMoreStuff::MethodWithDefaultsResults>(context));
+      return {
+        methodWithDefaults(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestMoreStuff::MethodWithDefaultsParams,  ::capnproto_test::capnp::test::TestMoreStuff::MethodWithDefaultsResults>(context)),
+        false
+      };
     case 9:
-      return getHandle(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestMoreStuff::GetHandleParams,  ::capnproto_test::capnp::test::TestMoreStuff::GetHandleResults>(context));
+      return {
+        getHandle(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestMoreStuff::GetHandleParams,  ::capnproto_test::capnp::test::TestMoreStuff::GetHandleResults>(context)),
+        false
+      };
     case 10:
-      return getNull(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestMoreStuff::GetNullParams,  ::capnproto_test::capnp::test::TestMoreStuff::GetNullResults>(context));
+      return {
+        getNull(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestMoreStuff::GetNullParams,  ::capnproto_test::capnp::test::TestMoreStuff::GetNullResults>(context)),
+        false
+      };
     case 11:
-      return getEnormousString(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestMoreStuff::GetEnormousStringParams,  ::capnproto_test::capnp::test::TestMoreStuff::GetEnormousStringResults>(context));
+      return {
+        getEnormousString(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestMoreStuff::GetEnormousStringParams,  ::capnproto_test::capnp::test::TestMoreStuff::GetEnormousStringResults>(context)),
+        false
+      };
     case 12:
-      return methodWithNullDefault(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestMoreStuff::MethodWithNullDefaultParams,  ::capnproto_test::capnp::test::TestMoreStuff::MethodWithNullDefaultResults>(context));
+      return {
+        methodWithNullDefault(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestMoreStuff::MethodWithNullDefaultParams,  ::capnproto_test::capnp::test::TestMoreStuff::MethodWithNullDefaultResults>(context)),
+        false
+      };
     default:
       (void)context;
       return ::capnp::Capability::Server::internalUnimplemented(
@@ -20102,7 +20180,7 @@ TestMembrane::Client::waitForeverRequest(::kj::Maybe< ::capnp::MessageSize> size
       "test.capnp:TestMembrane", "waitForever",
       0xc07d8dcd80a69c0cull, 4);
 }
-::kj::Promise<void> TestMembrane::Server::dispatchCall(
+::capnp::Capability::Server::DispatchCallResult TestMembrane::Server::dispatchCall(
     uint64_t interfaceId, uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (interfaceId) {
@@ -20112,25 +20190,40 @@ TestMembrane::Client::waitForeverRequest(::kj::Maybe< ::capnp::MessageSize> size
       return internalUnimplemented("test.capnp:TestMembrane", interfaceId);
   }
 }
-::kj::Promise<void> TestMembrane::Server::dispatchCallInternal(
+::capnp::Capability::Server::DispatchCallResult TestMembrane::Server::dispatchCallInternal(
     uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (methodId) {
     case 0:
-      return makeThing(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestMembrane::MakeThingParams,  ::capnproto_test::capnp::test::TestMembrane::MakeThingResults>(context));
+      return {
+        makeThing(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestMembrane::MakeThingParams,  ::capnproto_test::capnp::test::TestMembrane::MakeThingResults>(context)),
+        false
+      };
     case 1:
-      return callPassThrough(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestMembrane::CallPassThroughParams,  ::capnproto_test::capnp::test::TestMembrane::Result>(context));
+      return {
+        callPassThrough(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestMembrane::CallPassThroughParams,  ::capnproto_test::capnp::test::TestMembrane::Result>(context)),
+        false
+      };
     case 2:
-      return callIntercept(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestMembrane::CallInterceptParams,  ::capnproto_test::capnp::test::TestMembrane::Result>(context));
+      return {
+        callIntercept(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestMembrane::CallInterceptParams,  ::capnproto_test::capnp::test::TestMembrane::Result>(context)),
+        false
+      };
     case 3:
-      return loopback(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestMembrane::LoopbackParams,  ::capnproto_test::capnp::test::TestMembrane::LoopbackResults>(context));
+      return {
+        loopback(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestMembrane::LoopbackParams,  ::capnproto_test::capnp::test::TestMembrane::LoopbackResults>(context)),
+        false
+      };
     case 4:
-      return waitForever(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestMembrane::WaitForeverParams,  ::capnproto_test::capnp::test::TestMembrane::WaitForeverResults>(context));
+      return {
+        waitForever(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestMembrane::WaitForeverParams,  ::capnproto_test::capnp::test::TestMembrane::WaitForeverResults>(context)),
+        false
+      };
     default:
       (void)context;
       return ::capnp::Capability::Server::internalUnimplemented(
@@ -20167,7 +20260,7 @@ TestMembrane::Thing::Client::interceptRequest(::kj::Maybe< ::capnp::MessageSize>
       "test.capnp:TestMembrane.Thing", "intercept",
       0x9352e4e41f173917ull, 1);
 }
-::kj::Promise<void> TestMembrane::Thing::Server::dispatchCall(
+::capnp::Capability::Server::DispatchCallResult TestMembrane::Thing::Server::dispatchCall(
     uint64_t interfaceId, uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (interfaceId) {
@@ -20177,16 +20270,22 @@ TestMembrane::Thing::Client::interceptRequest(::kj::Maybe< ::capnp::MessageSize>
       return internalUnimplemented("test.capnp:TestMembrane.Thing", interfaceId);
   }
 }
-::kj::Promise<void> TestMembrane::Thing::Server::dispatchCallInternal(
+::capnp::Capability::Server::DispatchCallResult TestMembrane::Thing::Server::dispatchCallInternal(
     uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (methodId) {
     case 0:
-      return passThrough(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestMembrane::Thing::PassThroughParams,  ::capnproto_test::capnp::test::TestMembrane::Result>(context));
+      return {
+        passThrough(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestMembrane::Thing::PassThroughParams,  ::capnproto_test::capnp::test::TestMembrane::Result>(context)),
+        false
+      };
     case 1:
-      return intercept(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestMembrane::Thing::InterceptParams,  ::capnproto_test::capnp::test::TestMembrane::Result>(context));
+      return {
+        intercept(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestMembrane::Thing::InterceptParams,  ::capnproto_test::capnp::test::TestMembrane::Result>(context)),
+        false
+      };
     default:
       (void)context;
       return ::capnp::Capability::Server::internalUnimplemented(
@@ -20355,7 +20454,7 @@ TestKeywordMethods::Client::returnRequest(::kj::Maybe< ::capnp::MessageSize> siz
       "test.capnp:TestKeywordMethods", "return",
       0x9ae342d394247cfcull, 3);
 }
-::kj::Promise<void> TestKeywordMethods::Server::dispatchCall(
+::capnp::Capability::Server::DispatchCallResult TestKeywordMethods::Server::dispatchCall(
     uint64_t interfaceId, uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (interfaceId) {
@@ -20365,22 +20464,34 @@ TestKeywordMethods::Client::returnRequest(::kj::Maybe< ::capnp::MessageSize> siz
       return internalUnimplemented("test.capnp:TestKeywordMethods", interfaceId);
   }
 }
-::kj::Promise<void> TestKeywordMethods::Server::dispatchCallInternal(
+::capnp::Capability::Server::DispatchCallResult TestKeywordMethods::Server::dispatchCallInternal(
     uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (methodId) {
     case 0:
-      return delete_(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestKeywordMethods::DeleteParams,  ::capnproto_test::capnp::test::TestKeywordMethods::DeleteResults>(context));
+      return {
+        delete_(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestKeywordMethods::DeleteParams,  ::capnproto_test::capnp::test::TestKeywordMethods::DeleteResults>(context)),
+        false
+      };
     case 1:
-      return class_(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestKeywordMethods::ClassParams,  ::capnproto_test::capnp::test::TestKeywordMethods::ClassResults>(context));
+      return {
+        class_(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestKeywordMethods::ClassParams,  ::capnproto_test::capnp::test::TestKeywordMethods::ClassResults>(context)),
+        false
+      };
     case 2:
-      return void_(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestKeywordMethods::VoidParams,  ::capnproto_test::capnp::test::TestKeywordMethods::VoidResults>(context));
+      return {
+        void_(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestKeywordMethods::VoidParams,  ::capnproto_test::capnp::test::TestKeywordMethods::VoidResults>(context)),
+        false
+      };
     case 3:
-      return return_(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::TestKeywordMethods::ReturnParams,  ::capnproto_test::capnp::test::TestKeywordMethods::ReturnResults>(context));
+      return {
+        return_(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::TestKeywordMethods::ReturnParams,  ::capnproto_test::capnp::test::TestKeywordMethods::ReturnResults>(context)),
+        false
+      };
     default:
       (void)context;
       return ::capnp::Capability::Server::internalUnimplemented(
@@ -20559,7 +20670,7 @@ RenamedInterface::Client::renamedMethodRequest(::kj::Maybe< ::capnp::MessageSize
       "test.capnp:TestNameAnnotationInterface", "renamedMethod",
       0xd112a69d31ed918bull, 0);
 }
-::kj::Promise<void> RenamedInterface::Server::dispatchCall(
+::capnp::Capability::Server::DispatchCallResult RenamedInterface::Server::dispatchCall(
     uint64_t interfaceId, uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (interfaceId) {
@@ -20569,13 +20680,16 @@ RenamedInterface::Client::renamedMethodRequest(::kj::Maybe< ::capnp::MessageSize
       return internalUnimplemented("test.capnp:TestNameAnnotationInterface", interfaceId);
   }
 }
-::kj::Promise<void> RenamedInterface::Server::dispatchCallInternal(
+::capnp::Capability::Server::DispatchCallResult RenamedInterface::Server::dispatchCallInternal(
     uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (methodId) {
     case 0:
-      return renamedMethod(::capnp::Capability::Server::internalGetTypedContext<
-           ::capnproto_test::capnp::test::RenamedInterface::RenamedMethodParams,  ::capnproto_test::capnp::test::RenamedInterface::RenamedMethodResults>(context));
+      return {
+        renamedMethod(::capnp::Capability::Server::internalGetTypedContext<
+             ::capnproto_test::capnp::test::RenamedInterface::RenamedMethodParams,  ::capnproto_test::capnp::test::RenamedInterface::RenamedMethodResults>(context)),
+        false
+      };
     default:
       (void)context;
       return ::capnp::Capability::Server::internalUnimplemented(
diff --git a/CapnpCompatTest/test.capnp.h b/CapnpCompatTest/test.capnp.h
index cb19809..4e452b8 100644
--- a/CapnpCompatTest/test.capnp.h
+++ b/CapnpCompatTest/test.capnp.h
@@ -9,7 +9,7 @@
 #include <capnp/capability.h>
 #endif  // !CAPNP_LITE
 
-#if CAPNP_VERSION != 7000
+#if CAPNP_VERSION != 8000
 #error "Version mismatch between generated code and library headers.  You must use the same version of the Cap'n Proto compiler and library."
 #endif
 
@@ -1809,7 +1809,7 @@ extern const ::capnp::_::ConstStruct< ::capnproto_test::capnp::test::TestPrintIn
 extern const ::capnp::_::ConstStruct< ::capnproto_test::capnp::test::TestAllTypes> DERIVED_CONSTANT;
 extern const ::capnp::_::ConstStruct< ::capnproto_test::capnp::test::TestGenerics< ::capnproto_test::capnp::test::TestAllTypes,  ::capnp::Text>> GENERIC_CONSTANT;
 extern const ::capnp::_::ConstData<831> EMBEDDED_DATA;
-extern const ::capnp::_::ConstText<4235> EMBEDDED_TEXT;
+extern const ::capnp::_::ConstText<4236> EMBEDDED_TEXT;
 extern const ::capnp::_::ConstStruct< ::capnproto_test::capnp::test::TestAllTypes> EMBEDDED_STRUCT;
 extern const ::capnp::_::ConstText<10> NON_ASCII_TEXT;
 struct TestAnyPointerConstants {
@@ -10378,7 +10378,8 @@ class TestGenerics<Foo, Bar>::Inner2<Baz>::DeepNest<Qux>::DeepNestInterface<Quux
 public:
   typedef DeepNestInterface Serves;
 
-  ::kj::Promise<void> dispatchCall(uint64_t interfaceId, uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCall(
+      uint64_t interfaceId, uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context)
       override;
 
@@ -10393,7 +10394,8 @@ protected:
         .template castAs<typename  ::capnproto_test::capnp::test::TestGenerics<Foo, Bar>::template Inner2<Baz>::template DeepNest<Qux>::template DeepNestInterface<Quux>>();
   }
 
-  ::kj::Promise<void> dispatchCallInternal(uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCallInternal(
+      uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context);
 };
 #endif  // !CAPNP_LITE
@@ -10689,7 +10691,8 @@ class TestGenerics<Foo, Bar>::Interface<Qux>::Server
 public:
   typedef Interface Serves;
 
-  ::kj::Promise<void> dispatchCall(uint64_t interfaceId, uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCall(
+      uint64_t interfaceId, uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context)
       override;
 
@@ -10703,7 +10706,8 @@ protected:
         .template castAs<typename  ::capnproto_test::capnp::test::TestGenerics<Foo, Bar>::template Interface<Qux>>();
   }
 
-  ::kj::Promise<void> dispatchCallInternal(uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCallInternal(
+      uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context);
 };
 #endif  // !CAPNP_LITE
@@ -11278,7 +11282,8 @@ class TestImplicitMethodParams::Server
 public:
   typedef TestImplicitMethodParams Serves;
 
-  ::kj::Promise<void> dispatchCall(uint64_t interfaceId, uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCall(
+      uint64_t interfaceId, uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context)
       override;
 
@@ -11292,7 +11297,8 @@ protected:
         .template castAs< ::capnproto_test::capnp::test::TestImplicitMethodParams>();
   }
 
-  ::kj::Promise<void> dispatchCallInternal(uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCallInternal(
+      uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context);
 };
 #endif  // !CAPNP_LITE
@@ -11444,7 +11450,8 @@ class TestImplicitMethodParamsInGeneric<V>::Server
 public:
   typedef TestImplicitMethodParamsInGeneric Serves;
 
-  ::kj::Promise<void> dispatchCall(uint64_t interfaceId, uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCall(
+      uint64_t interfaceId, uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context)
       override;
 
@@ -11458,7 +11465,8 @@ protected:
         .template castAs< ::capnproto_test::capnp::test::TestImplicitMethodParamsInGeneric<V>>();
   }
 
-  ::kj::Promise<void> dispatchCallInternal(uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCallInternal(
+      uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context);
 };
 #endif  // !CAPNP_LITE
@@ -12279,7 +12287,8 @@ class TestInterface::Server
 public:
   typedef TestInterface Serves;
 
-  ::kj::Promise<void> dispatchCall(uint64_t interfaceId, uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCall(
+      uint64_t interfaceId, uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context)
       override;
 
@@ -12302,7 +12311,8 @@ protected:
         .template castAs< ::capnproto_test::capnp::test::TestInterface>();
   }
 
-  ::kj::Promise<void> dispatchCallInternal(uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCallInternal(
+      uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context);
 };
 #endif  // !CAPNP_LITE
@@ -12801,7 +12811,8 @@ class TestExtends::Server
 public:
   typedef TestExtends Serves;
 
-  ::kj::Promise<void> dispatchCall(uint64_t interfaceId, uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCall(
+      uint64_t interfaceId, uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context)
       override;
 
@@ -12822,7 +12833,8 @@ protected:
         .template castAs< ::capnproto_test::capnp::test::TestExtends>();
   }
 
-  ::kj::Promise<void> dispatchCallInternal(uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCallInternal(
+      uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context);
 };
 #endif  // !CAPNP_LITE
@@ -13142,7 +13154,8 @@ class TestExtends2::Server
 public:
   typedef TestExtends2 Serves;
 
-  ::kj::Promise<void> dispatchCall(uint64_t interfaceId, uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCall(
+      uint64_t interfaceId, uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context)
       override;
 
@@ -13153,7 +13166,8 @@ protected:
         .template castAs< ::capnproto_test::capnp::test::TestExtends2>();
   }
 
-  ::kj::Promise<void> dispatchCallInternal(uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCallInternal(
+      uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context);
 };
 #endif  // !CAPNP_LITE
@@ -13193,7 +13207,8 @@ class TestPipeline::Server
 public:
   typedef TestPipeline Serves;
 
-  ::kj::Promise<void> dispatchCall(uint64_t interfaceId, uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCall(
+      uint64_t interfaceId, uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context)
       override;
 
@@ -13216,7 +13231,8 @@ protected:
         .template castAs< ::capnproto_test::capnp::test::TestPipeline>();
   }
 
-  ::kj::Promise<void> dispatchCallInternal(uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCallInternal(
+      uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context);
 };
 #endif  // !CAPNP_LITE
@@ -13968,7 +13984,8 @@ class TestCallOrder::Server
 public:
   typedef TestCallOrder Serves;
 
-  ::kj::Promise<void> dispatchCall(uint64_t interfaceId, uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCall(
+      uint64_t interfaceId, uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context)
       override;
 
@@ -13983,7 +14000,8 @@ protected:
         .template castAs< ::capnproto_test::capnp::test::TestCallOrder>();
   }
 
-  ::kj::Promise<void> dispatchCallInternal(uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCallInternal(
+      uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context);
 };
 #endif  // !CAPNP_LITE
@@ -14171,7 +14189,8 @@ class TestTailCallee::Server
 public:
   typedef TestTailCallee Serves;
 
-  ::kj::Promise<void> dispatchCall(uint64_t interfaceId, uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCall(
+      uint64_t interfaceId, uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context)
       override;
 
@@ -14185,7 +14204,8 @@ protected:
         .template castAs< ::capnproto_test::capnp::test::TestTailCallee>();
   }
 
-  ::kj::Promise<void> dispatchCallInternal(uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCallInternal(
+      uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context);
 };
 #endif  // !CAPNP_LITE
@@ -14408,7 +14428,8 @@ class TestTailCaller::Server
 public:
   typedef TestTailCaller Serves;
 
-  ::kj::Promise<void> dispatchCall(uint64_t interfaceId, uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCall(
+      uint64_t interfaceId, uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context)
       override;
 
@@ -14422,7 +14443,8 @@ protected:
         .template castAs< ::capnproto_test::capnp::test::TestTailCaller>();
   }
 
-  ::kj::Promise<void> dispatchCallInternal(uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCallInternal(
+      uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context);
 };
 #endif  // !CAPNP_LITE
@@ -14547,7 +14569,8 @@ class TestHandle::Server
 public:
   typedef TestHandle Serves;
 
-  ::kj::Promise<void> dispatchCall(uint64_t interfaceId, uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCall(
+      uint64_t interfaceId, uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context)
       override;
 
@@ -14558,7 +14581,8 @@ protected:
         .template castAs< ::capnproto_test::capnp::test::TestHandle>();
   }
 
-  ::kj::Promise<void> dispatchCallInternal(uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCallInternal(
+      uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context);
 };
 #endif  // !CAPNP_LITE
@@ -14620,7 +14644,8 @@ class TestMoreStuff::Server
 public:
   typedef TestMoreStuff Serves;
 
-  ::kj::Promise<void> dispatchCall(uint64_t interfaceId, uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCall(
+      uint64_t interfaceId, uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context)
       override;
 
@@ -14683,7 +14708,8 @@ protected:
         .template castAs< ::capnproto_test::capnp::test::TestMoreStuff>();
   }
 
-  ::kj::Promise<void> dispatchCallInternal(uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCallInternal(
+      uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context);
 };
 #endif  // !CAPNP_LITE
@@ -16848,7 +16874,8 @@ class TestMembrane::Server
 public:
   typedef TestMembrane Serves;
 
-  ::kj::Promise<void> dispatchCall(uint64_t interfaceId, uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCall(
+      uint64_t interfaceId, uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context)
       override;
 
@@ -16877,7 +16904,8 @@ protected:
         .template castAs< ::capnproto_test::capnp::test::TestMembrane>();
   }
 
-  ::kj::Promise<void> dispatchCallInternal(uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCallInternal(
+      uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context);
 };
 #endif  // !CAPNP_LITE
@@ -16915,7 +16943,8 @@ class TestMembrane::Thing::Server
 public:
   typedef Thing Serves;
 
-  ::kj::Promise<void> dispatchCall(uint64_t interfaceId, uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCall(
+      uint64_t interfaceId, uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context)
       override;
 
@@ -16932,7 +16961,8 @@ protected:
         .template castAs< ::capnproto_test::capnp::test::TestMembrane::Thing>();
   }
 
-  ::kj::Promise<void> dispatchCallInternal(uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCallInternal(
+      uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context);
 };
 #endif  // !CAPNP_LITE
@@ -18127,7 +18157,8 @@ class TestKeywordMethods::Server
 public:
   typedef TestKeywordMethods Serves;
 
-  ::kj::Promise<void> dispatchCall(uint64_t interfaceId, uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCall(
+      uint64_t interfaceId, uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context)
       override;
 
@@ -18154,7 +18185,8 @@ protected:
         .template castAs< ::capnproto_test::capnp::test::TestKeywordMethods>();
   }
 
-  ::kj::Promise<void> dispatchCallInternal(uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCallInternal(
+      uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context);
 };
 #endif  // !CAPNP_LITE
@@ -18765,7 +18797,8 @@ class TestAuthenticatedBootstrap<VatId>::Server
 public:
   typedef TestAuthenticatedBootstrap Serves;
 
-  ::kj::Promise<void> dispatchCall(uint64_t interfaceId, uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCall(
+      uint64_t interfaceId, uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context)
       override;
 
@@ -18780,7 +18813,8 @@ protected:
         .template castAs< ::capnproto_test::capnp::test::TestAuthenticatedBootstrap<VatId>>();
   }
 
-  ::kj::Promise<void> dispatchCallInternal(uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCallInternal(
+      uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context);
 };
 #endif  // !CAPNP_LITE
@@ -19884,7 +19918,8 @@ class RenamedInterface::Server
 public:
   typedef RenamedInterface Serves;
 
-  ::kj::Promise<void> dispatchCall(uint64_t interfaceId, uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCall(
+      uint64_t interfaceId, uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context)
       override;
 
@@ -19899,7 +19934,8 @@ protected:
         .template castAs< ::capnproto_test::capnp::test::RenamedInterface>();
   }
 
-  ::kj::Promise<void> dispatchCallInternal(uint16_t methodId,
+  ::capnp::Capability::Server::DispatchCallResult dispatchCallInternal(
+      uint16_t methodId,
       ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context);
 };
 #endif  // !CAPNP_LITE
@@ -28487,7 +28523,7 @@ template <typename Foo, typename Bar>
 template <typename Baz>
 template <typename Qux>
 template <typename Quux>
-::kj::Promise<void> TestGenerics<Foo, Bar>::Inner2<Baz>::DeepNest<Qux>::DeepNestInterface<Quux>::Server::dispatchCall(
+::capnp::Capability::Server::DispatchCallResult TestGenerics<Foo, Bar>::Inner2<Baz>::DeepNest<Qux>::DeepNestInterface<Quux>::Server::dispatchCall(
     uint64_t interfaceId, uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (interfaceId) {
@@ -28501,13 +28537,16 @@ template <typename Foo, typename Bar>
 template <typename Baz>
 template <typename Qux>
 template <typename Quux>
-::kj::Promise<void> TestGenerics<Foo, Bar>::Inner2<Baz>::DeepNest<Qux>::DeepNestInterface<Quux>::Server::dispatchCallInternal(
+::capnp::Capability::Server::DispatchCallResult TestGenerics<Foo, Bar>::Inner2<Baz>::DeepNest<Qux>::DeepNestInterface<Quux>::Server::dispatchCallInternal(
     uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (methodId) {
     case 0:
-      return call(::capnp::Capability::Server::internalGetTypedContext<
-          typename  ::capnproto_test::capnp::test::TestGenerics<Foo, Bar>::template Inner2<Baz>::template DeepNest<Qux>::template DeepNestInterface<Quux>::CallParams, typename  ::capnproto_test::capnp::test::TestGenerics<Foo, Bar>::template Inner2<Baz>::template DeepNest<Qux>::template DeepNestInterface<Quux>::CallResults>(context));
+      return {
+        call(::capnp::Capability::Server::internalGetTypedContext<
+            typename  ::capnproto_test::capnp::test::TestGenerics<Foo, Bar>::template Inner2<Baz>::template DeepNest<Qux>::template DeepNestInterface<Quux>::CallParams, typename  ::capnproto_test::capnp::test::TestGenerics<Foo, Bar>::template Inner2<Baz>::template DeepNest<Qux>::template DeepNestInterface<Quux>::CallResults>(context)),
+        false
+      };
     default:
       (void)context;
       return ::capnp::Capability::Server::internalUnimplemented(
@@ -28867,7 +28906,7 @@ template <typename Qux>
 }
 template <typename Foo, typename Bar>
 template <typename Qux>
-::kj::Promise<void> TestGenerics<Foo, Bar>::Interface<Qux>::Server::dispatchCall(
+::capnp::Capability::Server::DispatchCallResult TestGenerics<Foo, Bar>::Interface<Qux>::Server::dispatchCall(
     uint64_t interfaceId, uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (interfaceId) {
@@ -28879,13 +28918,16 @@ template <typename Qux>
 }
 template <typename Foo, typename Bar>
 template <typename Qux>
-::kj::Promise<void> TestGenerics<Foo, Bar>::Interface<Qux>::Server::dispatchCallInternal(
+::capnp::Capability::Server::DispatchCallResult TestGenerics<Foo, Bar>::Interface<Qux>::Server::dispatchCallInternal(
     uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (methodId) {
     case 0:
-      return call(::capnp::Capability::Server::internalGetTypedContext<
-          typename  ::capnproto_test::capnp::test::TestGenerics<Foo, Bar>::template Inner2< ::capnp::Text>, typename  ::capnproto_test::capnp::test::TestGenerics<Foo, Bar>::template Interface<Qux>::CallResults>(context));
+      return {
+        call(::capnp::Capability::Server::internalGetTypedContext<
+            typename  ::capnproto_test::capnp::test::TestGenerics<Foo, Bar>::template Inner2< ::capnp::Text>, typename  ::capnproto_test::capnp::test::TestGenerics<Foo, Bar>::template Interface<Qux>::CallResults>(context)),
+        false
+      };
     default:
       (void)context;
       return ::capnp::Capability::Server::internalUnimplemented(
@@ -29831,7 +29873,7 @@ template <typename V>
       0xdf9ccdeb81a704c9ull, 0);
 }
 template <typename V>
-::kj::Promise<void> TestImplicitMethodParamsInGeneric<V>::Server::dispatchCall(
+::capnp::Capability::Server::DispatchCallResult TestImplicitMethodParamsInGeneric<V>::Server::dispatchCall(
     uint64_t interfaceId, uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (interfaceId) {
@@ -29842,13 +29884,16 @@ template <typename V>
   }
 }
 template <typename V>
-::kj::Promise<void> TestImplicitMethodParamsInGeneric<V>::Server::dispatchCallInternal(
+::capnp::Capability::Server::DispatchCallResult TestImplicitMethodParamsInGeneric<V>::Server::dispatchCallInternal(
     uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (methodId) {
     case 0:
-      return call(::capnp::Capability::Server::internalGetTypedContext<
-          typename  ::capnproto_test::capnp::test::TestImplicitMethodParamsInGeneric<V>::template CallParams<>,  ::capnproto_test::capnp::test::TestGenerics< ::capnp::AnyPointer,  ::capnp::AnyPointer>>(context));
+      return {
+        call(::capnp::Capability::Server::internalGetTypedContext<
+            typename  ::capnproto_test::capnp::test::TestImplicitMethodParamsInGeneric<V>::template CallParams<>,  ::capnproto_test::capnp::test::TestGenerics< ::capnp::AnyPointer,  ::capnp::AnyPointer>>(context)),
+        false
+      };
     default:
       (void)context;
       return ::capnp::Capability::Server::internalUnimplemented(
@@ -33401,7 +33446,7 @@ template <typename VatId>
       0xea72cc77253798cdull, 0);
 }
 template <typename VatId>
-::kj::Promise<void> TestAuthenticatedBootstrap<VatId>::Server::dispatchCall(
+::capnp::Capability::Server::DispatchCallResult TestAuthenticatedBootstrap<VatId>::Server::dispatchCall(
     uint64_t interfaceId, uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (interfaceId) {
@@ -33412,13 +33457,16 @@ template <typename VatId>
   }
 }
 template <typename VatId>
-::kj::Promise<void> TestAuthenticatedBootstrap<VatId>::Server::dispatchCallInternal(
+::capnp::Capability::Server::DispatchCallResult TestAuthenticatedBootstrap<VatId>::Server::dispatchCallInternal(
     uint16_t methodId,
     ::capnp::CallContext< ::capnp::AnyPointer, ::capnp::AnyPointer> context) {
   switch (methodId) {
     case 0:
-      return getCallerId(::capnp::Capability::Server::internalGetTypedContext<
-          typename  ::capnproto_test::capnp::test::TestAuthenticatedBootstrap<VatId>::GetCallerIdParams, typename  ::capnproto_test::capnp::test::TestAuthenticatedBootstrap<VatId>::GetCallerIdResults>(context));
+      return {
+        getCallerId(::capnp::Capability::Server::internalGetTypedContext<
+            typename  ::capnproto_test::capnp::test::TestAuthenticatedBootstrap<VatId>::GetCallerIdParams, typename  ::capnproto_test::capnp::test::TestAuthenticatedBootstrap<VatId>::GetCallerIdResults>(context)),
+        false
+      };
     default:
       (void)context;
       return ::capnp::Capability::Server::internalUnimplemented(
diff --git a/appveyor.yml b/appveyor.yml
index 0496dc8..6f3717d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,6 +9,8 @@ install:
   - cd c:\tools\vcpkg
   - vcpkg integrate install
   - vcpkg install capnproto
+  - set PATH_COPY=%PATH%
+  - set PATH=%PATH%;c:\tools\vcpkg\installed\x86-windows\tools\capnproto
   - cd %APPVEYOR_BUILD_FOLDER%
   - dotnet tool install -g nbgv
   - choco install reportgenerator.portable --version=4.5.6 --force -y
@@ -63,7 +65,6 @@ test_script:
       nbgv get-version -v NuGetPackageVersion >> version.txt
       set /P VERSION=< version.txt
       vstest.console /logger:Appveyor /inIsolation CapnpC.CSharp.Generator.Tests\bin\Release\netcoreapp3.1\CapnpC.CSharp.Generator.Tests.dll
-      choco install capnproto --source="https://chocolatey.org/api/v2" --force -y
       cd %APPVEYOR_BUILD_FOLDER%\capnpc-csharp
       dotnet tool install --global --add-source ./nupkg capnpc-csharp --version %VERSION%
       cd %APPVEYOR_BUILD_FOLDER%\install-test
@@ -77,7 +78,7 @@ test_script:
       choco install capnpc-csharp-win-x86 --source=".;https://chocolatey.org/api/v2" --force -y --version %VERSION% --pre
       cd %APPVEYOR_BUILD_FOLDER%\install-test
       compile-test
-      choco uninstall capnpc-csharp-win-x86 -y
+      set PATH=%PATH_COPY%
       notinstalled-test
       cd %APPVEYOR_BUILD_FOLDER%
       vstest.console /logger:Appveyor /inIsolation CapnpC.CSharp.MsBuild.Generation.Tests\bin\Release\netcoreapp3.1\CapnpC.CSharp.MsBuild.Generation.Tests.dll