Remove cache, actually fix NameFetcher