Second-level cache configuration
Fixed merge conflicts with latest master.
Merge pull request #247 from doctrine/slc

Second Level Cache