use modified version of cache... wait pull request accepted