Fix for OCM-69

My patch which adds support for a global object cache