Back to units passing.

StateCache now driven by applicationID for entries and state.