Added cache step back in