Use versioned subfolder for FileCache
Bump changelog
Merge branch '3.0' of github.com:Behat/Gherkin into 3.0