Begin rework of Cache