fixed a cache bug in iOS etc
make naming make more sense