chore: TODO comment for 1.8 support
fix: #234 could return nil at the end of retry