Untested mass replace to enabled caching

This will be cleaned up as we go, a quick test seemed to work out well
but we'll go through it porperly to ensure it's all good.