Add transients caching and more comments