Move email verification polling and key fetching into the wrapper