use TimeoutUtil, comment on sudden psi invalidation and resurrection
remove not existing module ref
fix tests