Bug 2190 cache fix

https://gist.github.com/artpard/836c06289b66b7e7fa32