update - bring back the cache
update - correction to shim find function