MOBILESDK-11 - Portrait not being cached properly