Merge "Revert "Pre-cache filter results"" into rvc-dev