Improve caching -
Try to force naming things.