Fix cache management to avoid failure in building release version

Fix cache management to avoid failure in building release version #453