NEXUS-5956: Simplify condition when to kick in
NEXUS-5956: Make support class return exact types, to ease life
NEXUS-5956: IT was wrong, do not delete but make proxy always go remote