What about adding something in IPersistentConnectionContext?