Added some tweaks to collection cache and base cache class