Enable to set whether next state caching is used or not.
Merge branch 'develop'