Add index by span name
Re-enable mapper caching.

Disabled for testing and accidentally checked in.