Add Cache and MapCache