added api fixes for caching