ECDR-29 - Updated to address comments and moved cache to separate package.
 - I also add in the logic to handle XML Wrapping that were done by Matt Ramey on a separate pull request
 - Didn't switch to guava cache at this time, since it is more of a test cache, but did synchronize access to the map.