Incorporated Cache into the system