use subscriptionId instead of subscriptionCrn (+ userCrn) as part of cache key for already uploaded items, also some simplifications to cache handling
Merge branch 'master' of github.com:callista-software/phk-patientdata-pump