Tidying up a bit.
Disabled caching.