Added class cache