Organize imports
Fix DuplicateObjectException:
- We must allow only one getOrCreateClient() at once.
- Also, because we don't store the client inside getOrCreateClient(), we must synchronize during the whole function