Tidied up caching calls.