diff --git a/quic/core/tls_handshaker.cc b/quic/core/tls_handshaker.cc
index ac959f2..ad7dafb 100644
--- a/quic/core/tls_handshaker.cc
+++ b/quic/core/tls_handshaker.cc
@@ -333,9 +333,7 @@
                                                  absl::string_view context,
                                                  size_t result_len,
                                                  std::string* result) {
-  // TODO(haoyuewang) Adding support of keying material export when 0-RTT is
-  // accepted.
-  if (SSL_in_init(ssl())) {
+  if (result == nullptr) {
     return false;
   }
   result->resize(result_len);
diff --git a/quic/test_tools/quic_client_session_cache_peer.h b/quic/test_tools/quic_client_session_cache_peer.h
index 6f0c667..227a48d 100644
--- a/quic/test_tools/quic_client_session_cache_peer.h
+++ b/quic/test_tools/quic_client_session_cache_peer.h
@@ -20,6 +20,11 @@
     }
     return iter->second->token;
   }
+
+  static bool HasEntry(QuicClientSessionCache* cache,
+                       const QuicServerId& server_id) {
+    return cache->cache_.Lookup(server_id) != cache->cache_.end();
+  }
 };
 
 }  // namespace test