Update formatting and cache (this) a little more
Merge pull request #1 from sc0ttkclark/patch-1

Update formatting and cache (this) a little more. props @sc0ttkclark