Added better caching'n stuff.