Merge branch 'fix/object-reinject-set-cache' into 'develop'