Cache finally working for real :)

Cache finally working :)