Revert "Fix for non-consistant collections from cache"

This reverts commit a8cdd693c57f290dcef8244cc3f1de1632164307.
Merge branch 'release'