Try to get more robust many-to-many invalidation
Remove odd code
Merge pull request #94 from ttyS15/master

Try to invalidate m2m in more robust way