Speed up async validation

Change-Id: I166a723c42ea1ce774a8e4f30a10a28ae417add9