Adding call clone and cacheFirst

Change-Id: I82e9eb4cb6d168768bf193db1af70a4b3bdac9fe