Add the cache support !
Fix the related Attributes issue