fix search - very inefficient
mihi
Fix cache updating