fix should not have psi refs
IDEA-108964 caching field accessors
IDEA-119864 indents
refactoring: class extracted
trying to fix blinking test