Merge charliesome:klasscache-2.0 into github-2.0.0