WIP: Fixing Cache Username & Passwd

Change-Id: Ib3a28de14215507610233abedc789a9ca8f0c64d