Merge pull request #364 from jerrinot/master

JCache tests compile again.