Modified cache to avoid unnecessary JSON conversions