Add manual caching for different blocks and functions