reindent
uncommented broken test... for now
more caching fixes