* commit '7451f15e7464fe8dd117b74c6dcff780785e0007': Fix issue #6926562: Ensure all multi-user cache files are managed correctly
* commit '7451f15e7464fe8dd117b74c6dcff780785e0007': Fix issue #6926562: Ensure all multi-user cache files are managed correctly