diff --git a/base/harmful/harmful.c b/base/harmful/harmful.c
index df625a3e4d6..4032fbf3b90 100644
--- a/base/harmful/harmful.c
+++ b/base/harmful/harmful.c
@@ -118,7 +118,7 @@ TRAP(logout)
 TRAP(logwtmp)
 TRAP(lrand48)
 TRAP(mallinfo)
-TRAP(mallopt)
+//TRAP(mallopt) // Used by tsan
 TRAP(mblen)
 TRAP(mbrlen)
 TRAP(mbrtowc)
@@ -193,7 +193,7 @@ TRAP(dbm_nextkey)
 TRAP(dbm_open)
 TRAP(dbm_store)
 TRAP(dirname)
-TRAP(dlerror)
+//TRAP(dlerror) // Used by tsan
 TRAP(ftw)
 TRAP(getc_unlocked)
 //TRAP(getenv) // Ok at program startup
diff --git a/contrib/cassandra b/contrib/cassandra
index fbbd9fc4c63..2935f6f15fe 160000
--- a/contrib/cassandra
+++ b/contrib/cassandra
@@ -1 +1 @@
-Subproject commit fbbd9fc4c634e9daad24714cd03cb390615d85ed
+Subproject commit 2935f6f15fea889899750560aa6331e9119e9dd0
diff --git a/tests/tsan_suppressions.txt b/tests/tsan_suppressions.txt
index ccc36d876f7..668710a33d7 100644
--- a/tests/tsan_suppressions.txt
+++ b/tests/tsan_suppressions.txt
@@ -1,4 +1,2 @@
 # looks like a bug in clang-11 thread sanitizer, detects normal data race with random FD in this method
 race:DB::LazyPipeFDs::close
-# races in openSSL https://github.com/openssl/openssl/issues/11974
-fun:evp_cipher_cache_constants