adapt to mapping changes, cleanup

What about caching right in Python object?