Changing the retry logic to only retry idempotent saves.