Added objects caching for custom store