Add cache step back in