Fix some of the resolver noise with a simple cache