Merge branch 'hotfix/2.0.2-3'
Added test for cache index update.
Fixed object index not updated.
Test cleanup
Merge branch 'hotfix/2.0.2-4' into develop