Make infinite fetch faster