Update formatting and cache (this) a little more