Fixed up test cases that now meet spec
Cache macro expansions to allow for a significant performance improvement
Added a note about macro caching