Issue 3621498: Cache invalidation on save

Oleksandr Antonchykrequested to merge
issue/shortcutperrole-3621498:3621498-cache-issue into 2.1.x

Closes #3621498

Merge request reports