Moving src caching to after manipulation

Change-Id: I528e9e80aece842d598eaf65d1b0c4255c14f775