Fix $/ lookup more properly.
A couple of performance tweaks.
Add back caching of dispatches.