Amount/Price Cache + possible currency npe fix