Speed improvements

Cuts request time in about half for uncached requests.