@@ -896,22 +896,11 @@ void cache_remove(unsigned char *md5, size_t size, const struct cl_engine *engin

     return;

 }

-/* Hashes a file onto the provided buffer and looks it up the cache.

-   Returns CL_VIRUS if found, CL_CLEAN if not FIXME or a recoverable error,

-   and returns CL_EREAD if unrecoverable */

-int cache_check(unsigned char *hash, cli_ctx *ctx) {

+int cache_get_MD5(unsigned char *hash, cli_ctx *ctx)

+{

     fmap_t *map;

     size_t todo, at = 0;

     void *hashctx;

-    int ret;

-

-    if(!ctx || !ctx->engine || !ctx->engine->cache)

-       return CL_VIRUS;

-

-    if (ctx->engine->engine_options & ENGINE_OPTIONS_DISABLE_CACHE) {

-        cli_dbgmsg("cache_check: Caching disabled. Returning CL_VIRUS.\n");

-        return CL_VIRUS;

-    }

     map = *ctx->fmap;

     todo = map->len;

@@ -920,7 +909,6 @@ int cache_check(unsigned char *hash, cli_ctx *ctx) {

     if (!(hashctx))

         return CL_VIRUS;

-

     while(todo) {

         const void *buf;

         size_t readme = todo < FILEBUFF ? todo : FILEBUFF;

@@ -942,6 +930,29 @@ int cache_check(unsigned char *hash, cli_ctx *ctx) {

     cl_finish_hash(hashctx, hash);

+    return CL_CLEAN;

+}

+

+/* Hashes a file onto the provided buffer and looks it up the cache.

+   Returns CL_VIRUS if found, CL_CLEAN if not FIXME or a recoverable error,

+   and returns CL_EREAD if unrecoverable */

+int cache_check(unsigned char *hash, cli_ctx *ctx) {

+    fmap_t *map;

+    int ret;

+

+    if(!ctx || !ctx->engine || !ctx->engine->cache)

+       return CL_VIRUS;

+

+    if (ctx->engine->engine_options & ENGINE_OPTIONS_DISABLE_CACHE) {

+        cli_dbgmsg("cache_check: Caching disabled. Returning CL_VIRUS.\n");

+        return CL_VIRUS;

+    }

+

+    ret = cache_get_MD5(hash, ctx);

+    if (ret != CL_CLEAN)

+        return ret;

+        

+    map = *ctx->fmap;

     ret = cache_lookup_hash(hash, map->len, ctx->engine->cache, ctx->recursion);

     cli_dbgmsg("cache_check: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x is %s\n", hash[0], hash[1], hash[2], hash[3], hash[4], hash[5], hash[6], hash[7], hash[8], hash[9], hash[10], hash[11], hash[12], hash[13], hash[14], hash[15], (ret == CL_VIRUS) ? "negative" : "positive");

     return ret;

@@ -2565,7 +2565,8 @@ static int magic_scandesc_cleanup(cli_ctx *ctx, cli_file_t type, unsigned char *

     }

     if (cb_retcode == CL_CLEAN && cache_clean) {

         perf_start(ctx, PERFT_CACHE);

-        cache_add(hash, hashed_size, ctx);

+        if (!(SCAN_PROPERTIES))

+            cache_add(hash, hashed_size, ctx);

         perf_stop(ctx, PERFT_CACHE);

     }

     return retcode;

@@ -2738,17 +2739,27 @@ static int magic_scandesc(cli_ctx *ctx, cli_file_t type)

     }

     perf_start(ctx, PERFT_CACHE);

-    res = cache_check(hash, ctx);

+    if (!(SCAN_PROPERTIES))

+        res = cache_check(hash, ctx);

 #if HAVE_JSON

     if (SCAN_PROPERTIES /* ctx.options & CL_SCAN_FILE_PROPERTIES && ctx->wrkproperty != NULL */) {

         char hashstr[33];

-        snprintf(hashstr, 33, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", hash[0], hash[1], hash[2], hash[3], hash[4], hash[5], hash[6], hash[7], hash[8], hash[9], hash[10], hash[11], hash[12], hash[13], hash[14], hash[15]);

+        ret = cache_get_MD5(hash, ctx);

+        if (ret != CL_SUCCESS) {

+            early_ret_from_magicscan(ret);

+        }

+        snprintf(hashstr, 33, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",

+                 hash[0], hash[1], hash[2], hash[3], hash[4], hash[5], hash[6], hash[7],

+                 hash[8], hash[9], hash[10], hash[11], hash[12], hash[13], hash[14], hash[15]);

         ret = cli_jsonstr(ctx->wrkproperty, "FileMD5", hashstr);

+        if (ctx->engine->engine_options & ENGINE_OPTIONS_DISABLE_CACHE)

+            memset(hash, 0, sizeof(hash));

         if (ret != CL_SUCCESS) {

             early_ret_from_magicscan(ret);

         }

+        res = CL_VIRUS;

     }

 #endif