PLATFORM-364 Better connecting logic to wrap up async calls