Fixed cache checkpoint bug and renamed some config classes