CacheManager will now return a new string encryptor if no encryptor exists in the cache.
Merge remote-tracking branch 'origin/master'