Fixed #32 - improved cache methods