Fixup caching
Paring enhancements, brace matcher, and settings update