Reverted fixes made for test account. Added new cache