Shorter caching of error states, optimized validators

Change-Id: I412a6ec77c89eee50d728bb0dd4591eb1a854541
Merge "Shorter caching of error states, optimized validators"