Unnecessary creation of objects when using cache Autodiscover type
Fix Total Time execution in debug.
Merge branch 'master' into sifo3-beta

* master:
  Fix Total Time execution in debug.
  Unnecessary creation of objects when using cache Autodiscover type