Several bug fixes - the cache still caused issues.
BugzId: 2711