Cherry pick bugfix set local in rebuild cache