Merge "Remove un-needed cacheing layer for OS Clients"