disable caching by default
minor code cleanup