Backport rlm_cache merge fixes from master