Merge pull request #944 from nupplaphil/task/cleanup_cache