Work around macro context cache issue.
Release 0.5.0