Mango improvements & Cache fixes