Improve the getting caller class