Merge pull request #982 from block-mesh/cache-data-sink-users

Merge pull request #982 from block-mesh/cache-data-sink-users #2425