Make interval failure policy a wrapper

so that we can wrap anything inside it
Update for the new interval API