Added Enterprise Library Caching
Resolved conflicts