Replace cache -> fetch, add save policy section