Added more caching.
Added caching.