Fixed as per PR comments. Root test/failure taken out. Cache moved to per instance from global.