fixed caching errors (we weren't caching what we thought we were)