Fixed makeMarkedUpVersion/decryptAndCacheImages