Make the filter cache bigger (and independent)

@rev fabbott@
Merging origin/goliver/master-pending-bigger-cache into master