Fix for Pod objects saving and $current_pod caching
Fixes #1832