more cleanup; fixes in cache for apidoc generation