I will fix this on a new pull request with more improvements to the cache logic.