Revert "improved join/leave/rename caching"

This reverts commit 4b5b7092060c9b52e6127f32fab9c46925857e25.