Tooling api fixes for the new cache handling
Various fixes