Remove cache and storage support