Fix timeout issues when retrying a non-instant set of functions