Revert "Pre-cache filter results"

This reverts commit c68d8124bb26c27914f3d7f2ac330b15b8d39e45.

Reason for revert: Broken test

Change-Id: I91bc693f508a947dea95ee3483045790927f88c9
Fixes: 158626593
3 files changed