Cache classes renamed and properly namespaced