The caching is done only per process, so the cleanup during logout
does not really work since the during could be handled by another
process. So the cache will just keep on growing.
Change-Id: I793fbee44eb5f9befc316efe6716971b0e32172b
Partial-Bug: #1451943
(cherry picked from commit 6f83d38da2)