removed 'set' nonsense
started cache matching