Add cache and fix format.