caching: better default variable support
tests fix