Update CacheFilter to take request objects instead of strings
Be more specific about qtype for some dig tests