enrich client APIs with timed waits