Change headers to expect thunks