cinder: fix class cycle dependency
Merge pull request #369 from gabrielecerami/cinder-cycle-dep-fix1

cinder: fix class cycle dependency