Split member and group controllers, fixed simple caches
Dirty fix dead-lock