added support for cached match variables