change caching & add warning for searching