Merge pull request #234 from heiseda/master

Previous Memoization cache lookup key caused bas rewrites. Changed to...