RSM/cache issue fixes