Added variable caching and cleanup