Changes to fetch logic, including blocking.