Simplify the filter logic for uncached items