Rework of the cached match driver