Implemented Cache into bundle