Add Cache and fix the search form