[Bug 825577] fix cache [r=vingtetun]
Merge pull request #7255 from EverythingMe/bugfix-cache

[Bug 825577] fix cache [r=vingtetun]
Auto-merge from branch 'master'