Use an async-aware Mutex implementation

Use an async-aware Mutex implementation #6158