Merge branch 'ab/cache-api-cleanup-users'