Rangizingo/cc-cache-fix