Draft: Removed unused cache