Could you also remove the `@ThreadSafe` annotation? It implies that the class does its own locking, but it doesn't.