Implement more aggressive retry logic for resolving and first interview

Implement more aggressive retry logic for resolving and first interview #1032