Fix Unit Caching

Fixed many regressions, updated cache checking code, updated monitoring
code, etc.