Interim: keep a record of etags and support retrying with timeout