Combine role caching actions

[greyfiles]

There is repeated code for when the role cache needs to be rebuilt that should be combined into one method.