Retry on deadlocks.  Remove commit from bw_usage_cache update