Fixed search and updated cache