Make sure singleton instance depends on argument hash

Ensure that a singleton instance is stored for a set of invoked
arguments