Revert "Revert "Merge pull request #1367 from openscholar/1357""

This reverts commit 0bc4c9a33757028625299e1ed8f565aba0280e9a.
Add cache invalidate.
Improve comment.