Updates to Cache and test utility to support user testing.
Updates to support better UI