Change caching logic for placeholders