Switch from a wrapper class (which needed expensive HashMap lookups) to a mixin
Add generic example to README