Merge "Clean up newWANCacheFromParams() getInstance() calls"