#12 Bug fix: Calculate best match correctly (and cache available mapping)