argh
argh
backport threaded tile cache
clean up after fix

threaded tile cache seems a good solution --- clean up and get ready to
merge back into master