DDF-572: Fixed cache hashing to allow for proper caching functionality