Fix cache and cache archive