Branch

- small cleanup
- no double entities
- improve cache expiring for discussions


Close #3 - works fine for me.