Refactored utility classes into separate library. Fixed memory leak in DsCache