Minor fix cache-all option
More fix on formating.