[WIP] added cache expiry and fixing hashing