Merge "Fix double create of Caches"