Added more robust support for caching searchs.  -Jon I