Merge "BUG-994: introduce object-cache into distribution"