Merge pull request #1 from srotsch/master

[TASK] Performance optimization
Merge pull request #2 from srotsch/master

[TASK] Flush CF cache when modifying visibility settings