Added some cache changes