Modularised the Cache support