Cache issue fixes.
Naming Pattern issues fixed.
Regex patterns cleaned up.
Misc bug fixes.