Better timeout handling + fixed backend lookup every request