Merge pull request steipete#18 from bjhomer/pull-request-archiver-methods

Don't mix non-keyed archiver methods with keyed archiver methods.

Author: steipete

SDURLCache.m

@@ -280,15 +280,15 @@ @implementation NSCachedURLResponse(NSCoder)
 #pragma clang diagnostic ignored "-Wobjc-protocol-method-implementation"
 
 - (void)encodeWithCoder:(NSCoder *)coder {
-    [coder encodeDataObject:self.data];
+    [coder encodeObject:self.data forKey:@"data"];
     [coder encodeObject:self.response forKey:@"response"];
     [coder encodeObject:self.userInfo forKey:@"userInfo"];
     [coder encodeInt:self.storagePolicy forKey:@"storagePolicy"];
 }
 
 - (id)initWithCoder:(NSCoder *)coder {
     return [self initWithResponse:[coder decodeObjectForKey:@"response"]
-                             data:[coder decodeDataObject]
+                             data:[coder decodeObjectForKey:@"data"]
                          userInfo:[coder decodeObjectForKey:@"userInfo"]
                     storagePolicy:[coder decodeIntForKey:@"storagePolicy"]];
 }
@@ -333,8 +333,9 @@ + (NSString *)cacheKeyForURL:(NSURL *)url {
     const char *str = [url.absoluteString UTF8String];
     unsigned char r[CC_MD5_DIGEST_LENGTH];
     CC_MD5(str, strlen(str), r);
-    return [NSString stringWithFormat:@"%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
-            r[0], r[1], r[2], r[3], r[4], r[5], r[6], r[7], r[8], r[9], r[10], r[11], r[12], r[13], r[14], r[15]];
+    static NSString *cacheFormatVersion = @"2";
+    return [NSString stringWithFormat:@"%@_%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
+            cacheFormatVersion, r[0], r[1], r[2], r[3], r[4], r[5], r[6], r[7], r[8], r[9], r[10], r[11], r[12], r[13], r[14], r[15]];
 }
 
 #pragma mark SDURLCache (private)