Use fetcher_strategy everywhere instead of hard-coded constant