Upgrade for new SDK and less aggressive cache