Minor formatting, and added cache