4037 Expire cache
Merge pull request #1744 from sarken/issue_4037

4037 Expire cache