Cache / View fixes

Fixes items getting cached incorrectly, makes working with HTML views more practical