fix caching loophole
switch back to single fetch match