use computeIfAbsent and Arrays.asList instead of creating a new Array

use computeIfAbsent and Arrays.asList instead of creating a new Array #2118