fix cache name, search slightly better