Fixed cacher
Minor changes