modify for cache common parts changes