Added cahce capability, turned off for now