Modified project to accommodate cached storage