Some Simon Evilness(TM) + a cache key fix