Add cache and storage