Refactored concurrent fetching bugs in client adapter