Prepare for async client

Change-Id: Iaeb08401f18dc881ea59e920c4d6f1147b630c6f