Use the cleanup context to re-use values from the original context Signed-off-by: Derek McGowan <derek@mcg.dev>