cinder: fix class cycle dependency