diff --git a/src/Tests/AuthoringWinUITest/AuthoringWinUITest (Package)/AuthoringWinUITest (Package).assets.cache b/src/Tests/AuthoringWinUITest/AuthoringWinUITest (Package)/AuthoringWinUITest (Package).assets.cache
new file mode 100644
index 000000000..916902922
Binary files /dev/null and b/src/Tests/AuthoringWinUITest/AuthoringWinUITest (Package)/AuthoringWinUITest (Package).assets.cache differ
diff --git a/src/cswinrt/code_writers.h b/src/cswinrt/code_writers.h
index cbe357e98..0c4dff66e 100644
--- a/src/cswinrt/code_writers.h
+++ b/src/cswinrt/code_writers.h
@@ -2529,11 +2529,10 @@ db_path.stem().string());
     {
         if (for_typedef(w, get_type_semantics(evt.EventType()), [&](TypeDef const& eventType)
             {
-                if (eventType.TypeNamespace() == "System" && eventType.TypeName() == "EventHandler`1")
+                if ((eventType.TypeNamespace() == "Windows.Foundation" || eventType.TypeNamespace() == "System") && eventType.TypeName() == "EventHandler`1")
                 {
                     auto [add, remove] = get_event_methods(evt);
-                    w.write(R"(
-new EventSource__EventHandler%(_obj,
+                    w.write(R"( new EventSource__EventHandler%(_obj,
 %,
 %))",
 bind<write_type_params>(eventType),
@@ -6458,7 +6457,7 @@ bind<write_type_name>(type, typedef_name_type::CCW, true)
     {
         for_typedef(w, eventTypeSemantics, [&](TypeDef const& eventType)
             {
-                if (eventType.TypeNamespace() == "System" && eventType.TypeName() == "EventHandler`1")
+                if ((eventType.TypeNamespace() == "Windows.Foundation" || eventType.TypeNamespace() == "System") && eventType.TypeName() == "EventHandler`1")
                 {
                     return;
                 }