Added API tracing
Altered caching mechanism