CXF-8712 One-off issue with retries (#954)