Fix typo
Simplify selection
Short circuit consistency check if possible
Need to invalidate cache here now
Wrap long line