Move match() and matchOrNull() to MatchCache

It was a bit weird to have these on the PredicateCache, only to be
effectively mirrored in MatchCache, move them to MatchCache to simplify
the code and make it a bit more intuitive.

Change-Id: I6c97569948c675d366ae576e2b633f4a9ccbee7c
2 files changed