More use of cave predicates