Add TODOs
diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/fork_windows.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/fork_windows.pyx.pxi
index 9167cb4..f0faa09 100644
--- a/src/python/grpcio/grpc/_cython/_cygrpc/fork_windows.pyx.pxi
+++ b/src/python/grpcio/grpc/_cython/_cygrpc/fork_windows.pyx.pxi
@@ -19,6 +19,7 @@
     grpc_init()
 
 
+# TODO: Propagate contextvars.
 class ForkManagedThread(object):
     def __init__(self, target, args=()):
         self._thread = threading.Thread(target=target, args=args)
diff --git a/src/python/grpcio_tests/tests/unit/_contextvars_propagation_test.py b/src/python/grpcio_tests/tests/unit/_contextvars_propagation_test.py
index dc4a7e7..fe675ec 100644
--- a/src/python/grpcio_tests/tests/unit/_contextvars_propagation_test.py
+++ b/src/python/grpcio_tests/tests/unit/_contextvars_propagation_test.py
@@ -106,6 +106,8 @@
                 self.assertEqual(_REQUEST, response)
                 test_call_credentials.assert_called(self)
 
+    # TODO: Test simple unary-unary.
+
 
 if __name__ == '__main__':
     logging.basicConfig()