Add a better caching mechanism.
Fix access to non-combo variables.