Fix caching for searches