Fixes for post-processing issues.

Improvements made to caches for overall performance boost and more accurate matches.

Misc bug fixes applied.