use doctrine's metadata cache
Merge branch 'master' into 2.1