Refactor: do not construct Vaquero many times