#88 added support for caching lookups