Make resolve() a non-blocking call