Added cache to doctrine and moduleconfig.  Also upgraded doctrine
Merge remote-tracking branch 'origin/master'